what should I do with this error message? (binary merge issue)

[epeleg]

Error:

The parent revision of the item /i18n.xlsm is inconsistent with the loaded one in the changeset cs:5

The file is an excel file that I had on the main branch,

created a new branch

modified and checked in on branch

then merged back into main

and no I get this error when I am trying to check in all the pending changes in main

[psantosl]

Ok, this error happens because:

- you had a modified file (not checked out), let's say starting from cset 1

- you update your workspace to cset 2, in which the faulty file was modified, but since it is changed, it is not overwritten

- checkin doesn't let you proceed because you would be loosing the changes from cset2 of the file.

You must:

- copy your file to a different location

- update the file

- check if what you changed is fine, reapply changes and so on

- checkin

Ideally we will shelve or simply cancel the switch to branch if there are pending changes, but this is how it works in the current version if you overwrite changed files.

[epeleg]

I must be missing something at the basic's level.

What is the meaning of "update the file"?

The branch explorer is currently on the main branch.

I have changeset 5 within the main brach,

from this changeset I created a new branch called /main/task80

I edited several files on the new branch and checked them in (changeset 6)

I then though that I was editing the excel file on that branch as well,

however it turned out that I was editing a copy of it that was outside workspace and not under source control,

so I copied it over to the worspace and checked it in.

so branch /main/task80 now shows 2 change sets within it: 6 (for the files I edited) and 7 (for the additional excel file).

I then switched to the main branch and did a merge from /main/task80,

the Branch explorer shows a dotted green line from cs:7 to the main branch (or is it to the label I gave cs:5 ???)

the tooltip for this dotted line says:

"Merge Link, Pending

Source:changeset 7 on branch /main/task80

Destination: a new changeset will be created when you checkin your changes"

when I look at the pending changes list (on /main)

all the files I change in CS:6 are listed with a status of "Replaced"

and only my excel file is listed as "Checked out".

If I go to the Items in workspace pane, go to the excel file, right click it and choose update,

I get an error message saying:

"There are pending changes in your workspace. Update can not be

executed it there are pending changes. Please checkin/undo your

pending changes and try the update again."

same message if I try "update forced on this file".

If I try to "undo checkout" on this file I first get a warning to confim that I ready want to undo,

and when I click "Yes" get the following error message:

"Cannot perform a partial undo if there are pending merge links, Please

repeat the operation including all pending changes."

If I choose "checkin" on this file I again get the following error:

"Cannot perform a partial checkin if there are pending merge links. All

changes must be checked in together to ensure that the merge

traceability is correctly stored.Please repeat the operation including all pending changes."

and If I try to do the checing from the "pending changes" pane I get the original error:

"The parent revision of the item /i18n.xlsm is inconsistent with the loaded one in the changeset cs:5"

so because I can not do the update you suggested on the /main branch - I thought that maybe I should do it on the /main/task80 branch

but when I try to switch to the /main/task80 branch I get yet another error:

"Cannot perform the switch to branch/label since there are pending

changes. Please review the pending changes and retry the operation again."

ohh....

finally something that works.

I just did an undo changes on all the pending changes in /main

and not the dotted green line is gone.

now I was able to switch back to the /main/task80 branch

my excel file looks o.k.

switched back to the /main

did merge from /main/task80

checked in and everything works

hallelujah.

Thanks for listening, I hope this will help someone sometime.

If anyone from codice is reading this, I believe some of those error messages should be re-though

as the seem to tell you to do things that can not be done...

Other then this - I really like your product.