| Subversive & merges [message #16486] |
Thu, 17 April 2008 11:21  |
Eclipse User |
|
|
|
Originally posted by: dcorbin.allureglobal.com
We recently switched our large project to SVN + Subversive.
When we Synchronize, merge conflicts seem to be handled "much more weakly"
than CVS did.
1) When you compare a file containing conflicts, there is no "red section"
to the diff saying, "here is a place were both files have changed".
2) And if you just say update and it cannot automatically merge the files,
there is no error message shown saying that the update was incomplete.
Are we missing something?
Thanks
David
|
|
|
| Re: Subversive & merges [message #16586 is a reply to message #16486] |
Fri, 18 April 2008 06:38  |
| Eclipse User |
|
|
|
Originally posted by: Marko.Schulz.gmail.com
"David Corbin" <dcorbin@allureglobal.com> wrote:
>
> 1) When you compare a file containing conflicts, there is no "red section"
> to the diff saying, "here is a place were both files have changed".
Conflicts on a file may only mean that there are incoming as well as
outgoing changes. So there don't have to be conflicting lines (a red
section) and without such lines the files should be merged cleanly when
doing an update. AFAIR this was the same with CVS but I haven't used CVS for
a year now.
marko
|
|
|
| Re: Subversive & merges [message #16634 is a reply to message #16486] |
Fri, 18 April 2008 13:24 |
| Eclipse User |
|
|
|
Originally posted by: alexander.gurov.polarion.org
Hello David,
I want to add more information to Marko's description of SVN behaviour.
SVN client code performs updates/merges even if conflict cannot be
resolved automatically. In that case SVN stores all information required
for manual merge of conflicting files inside the working copy. Then
Subversive marks corresponding files in the workspace tree like
"conflicting" ("red barrel" mark) and you can use "Edit Conflicts" action
in order to solve conflicts manually.
|
|
|
Powered by
FUDForum. Page generated in 0.01648 seconds
] 
Search
Help
Register
Login
Home
