[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Odd behaviour when merging.

From: Erik Enge <eenge_at_prium.net>
Date: 2005-09-14 21:55:53 CEST

Quoting Robert Swarbrick <robert.swarbrick@asg.com>:

> This is based on my knowledge of using Subversion, not an
> understanding
> of the source code.

Thanks for your reply. I can see your point and I appreciate your
taking time and laying it out so nicely though I would like to
illustrate my side of it using the same example, just different
text on the lines and prehaps get your comments on this version.

(Pseudocode ahead.)

(A) commits the file:
        if some_global_var:
          print "going to delete all files"
        <emptyline>

(B) obtains this file in an update, and doesn't like it at all:
        <emptyfile>

(A) realizes he forgot to add the rm -rf and does so by commit the
following file:
       if some_global_var:
         print "going to delete all files"
         rm -rf /var/database/
       <emptyline>

(B) now performs the update and subversion says "G" which he
takes to mean that there were changes but it successfully merged.
He takes a look at the file:
         rm -rf /var/database/
       <emptyfile>

The conditional rm -rf has turned into an unconditional one. Is it
your view that it still does the right thing? CVS gives a conflict and
so does svn using --diff3-cmd=/usr/bin/diff3 (even though Subversion
says G it actually puts the .mine, .rev1 and .rev2 files in the
directory - which has correctly identified the conflict, IMHO,
but that's a separate problem, I suppose).

Thoughts?

Thanks,
Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 14 21:58:24 2005

This is an archived mail posted to the Subversion Users mailing list.