> Hi All,
> I would like to use the 'svn merge' command (using svn release 1.6) to
> regularly sync my branch with the trunk.
> I created repository that contains the following structure:
> + trunk (revision 1)
> + branches (revision 2)
> I added into the trunk the file file1 (revision 3)
> I copied the trunk into a new branch (1.0) (revision 4)
> I added into the trunk a new file file2 (revision 5)
> I checked out my branch 1.0. In the new directory, I typed the
> following command:
> svn merge ^/trunk --dry-run
> And I got an unexpected conflict:
> --- Merging r2 through r5 into '.':
> C file1
> A files2
> Summary of conflicts:
> Tree conflicts: 1
> However, when I try to do the same merge with Turtoise, it works fine
> but I don't know how it manages to do it.
> Here is the log I found from Turtoise:
> Command : Merging revisions 1-HEAD of svn://xxxxx/SVN/trunk
> into C:\tmp\test, respecting ancestry, Test Only
> Merging r2 through r5 : C:\tmp\test
> Added : C:\tmp\test\file1
> Added : C:\tmp\test\file2
> Finished! :
> As you can see there is no conflict with Turtoise.
> Notice that if I merge with the command line and I do a svn status, I
> got this message:
> ksh$ svn st
> C file1
> > local obstruction, incoming add upon merge
> A + file2
> like if 'file1' has been copied twice in both trunk and the branch
TSVN passes the '--force' param to the merge command.
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-17 19:35:00 CEST