| Revisions to stop merge at & merge markers in the source [message #534046] |
Mon, 17 May 2010 19:38  |
 David M. Karr
Messages: 813
Registered: July 2009 |
Senior Member |
|
|
I'm using Subversive 0.7.9, with the 1.1.7 connector, talking to SVN 1.4.x on the server.
I'm doing some merging experiments to get a better feel for how this works. I would appreciate some explanation or elaboration of the minor issues I saw while going down this path.
I checked out two copies of a project, appending "-<branch>" and "-trunk" to each name, where the former was checked out from a branch, and the latter from the trunk.
I selected the "-trunk" project and selected "Merge" from the menu. In the "URL tab" (as opposed to "2 URLs"), I browsed to the project branch (the same one that I used to check out the other project). In the "Start Revision" I selected "Head Revision".
In the "Stop Revision" I first tried leaving this also set at "Head Revision". When I clicked OK, I found that this did nothing. I suppose this was simply saying that it was merging from a zero-length revision range, so there was nothing to do.
I then tried clicking "Browse" on the "Stop Revision". In the list of revisions, I first tried selecting the first revision and executing that merge. This appeared to be identical to the run with both at "Head Revision". I suppose the first revision is the head revision, so this should be the same.
I then selected the second revision and executed the merge. This is the first test where I expected to see changes. It went into the Synchronize perspective, and it showed me the only file that changed as a conflict. The "Remote File" pane looked as I expected it, but the "Local File" pane had "<<<<< .working", "=====", and ">>>>> .merge-right.r<revision>" lines. This was somewhat surprising. I've done merges in the past, and I've found that this happens sometimes, but not always. Will this only happen when there is a conflict? Is this perhaps a symptom of using SVN 1.4.x on the server?
|
|
|
| Re: Revisions to stop merge at & merge markers in the source [message #535059 is a reply to message #534046] |
Fri, 21 May 2010 08:04  |
Igor Burilo
Messages: 435
Registered: July 2009 |
Senior Member |
|
|
Hello David,
> The "Remote File" pane looked as I expected it, but the "Local File"
> pane had "<<<<< .working", "=====", and ">>>>> .merge-right.r<revision>"
> lines. This was somewhat surprising.
You have "<<<<<" and ">>>>>" in file content if file has conflicts, you
can also have these markers if you do update. For more details about
conflict markers and file conflicts you can read in SVN book.
> I'm using Subversive 0.7.9, with the 1.1.7 connector, talking to SVN
> 1.4.x on the server.
>
> I'm doing some merging experiments to get a better feel for how this
> works. I would appreciate some explanation or elaboration of the minor
> issues I saw while going down this path.
>
> I checked out two copies of a project, appending "-<branch>" and
> "-trunk" to each name, where the former was checked out from a branch,
> and the latter from the trunk.
>
> I selected the "-trunk" project and selected "Merge" from the menu. In
> the "URL tab" (as opposed to "2 URLs"), I browsed to the project branch
> (the same one that I used to check out the other project). In the "Start
> Revision" I selected "Head Revision".
>
> In the "Stop Revision" I first tried leaving this also set at "Head
> Revision". When I clicked OK, I found that this did nothing. I suppose
> this was simply saying that it was merging from a zero-length revision
> range, so there was nothing to do.
>
> I then tried clicking "Browse" on the "Stop Revision". In the list of
> revisions, I first tried selecting the first revision and executing that
> merge. This appeared to be identical to the run with both at "Head
> Revision". I suppose the first revision is the head revision, so this
> should be the same.
>
> I then selected the second revision and executed the merge. This is the
> first test where I expected to see changes. It went into the Synchronize
> perspective, and it showed me the only file that changed as a conflict.
> The "Remote File" pane looked as I expected it, but the "Local File"
> pane had "<<<<< .working", "=====", and ">>>>> .merge-right.r<revision>"
> lines. This was somewhat surprising. I've done merges in the past, and
> I've found that this happens sometimes, but not always. Will this only
> happen when there is a conflict? Is this perhaps a symptom of using SVN
> 1.4.x on the server?
--
Best regards,
Igor Burilo
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.03964 seconds
] 
Search
Help
Register
Login
Home
