Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: tree conflicts with replace

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: tree conflicts with replace

Author markphip
Full name Mark Phippard
Date 2009-08-15 08:18:44 PDT
Message On Sat, Aug 15, 2009 at 10:40 AM, Stefan Sperling<stsp at elego dot de> wrote:
>> What are we discussing, again?
>
> I don't know. I just stumbled into this discussion because for some
> reason what I read here made me realise that the above problem exists.
>
> When people hit this, and don't understand how the mergeinfo stuff
> and 'svn revert' work, they will probably not realise that the real
> problem is that they don't understand enough of the internal workings
> of the tool and lack the corresponding insights into the tool's limitations
> to be capable of dealing with the limitation they just hit.
> And then they will [rightfully] blame Subversion for the problem,
> i.e. they will blame us for not having fixed this limitation.

I do not buy into this at all. There is no question that revert
should also remove any mergeinfo changes on the target. If it didn't,
then that would mean you could not revert ANY merge.

I also fail to see how this is confusing. If your normal merge patten
is to merge all unmerged revisions (which is the basic scenario you
are describing), then it makes perfect sense that you would need to
use --record-only if there is a revision that you need to revert but
do not want to keep merging in the future. I do not see any signs
that users are confused by this part of merge.


--
Thanks

Mark Phippard
http://markphip.blogspot.com/

« Previous message in topic | 15 of 16 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
tree conflicts with replace neels Neels Janosch Hofmeyr 2009-08-12 17:45:42 PDT
     Re: tree conflicts with replace neels Neels Janosch Hofmeyr 2009-08-12 17:48:02 PDT
     Re: tree conflicts with replace julianfoad Julian Foad 2009-08-12 18:02:48 PDT
         Re: tree conflicts with replace vinc17 Vincent Lefevre 2009-08-13 02:50:28 PDT
             Re: tree conflicts with replace sbutler Stephen Butler 2009-08-13 16:17:02 PDT
         Re: tree conflicts with replace Bill Tutt <bill dot tutt at gmail dot com> Bill Tutt <bill dot tutt at gmail dot com> 2009-08-13 07:51:19 PDT
             Re: tree conflicts with replace cmpilato C. Michael Pilato 2009-08-13 08:52:31 PDT
                 Re: tree conflicts with replace Bill Tutt <bill dot tutt at gmail dot com> Bill Tutt <bill dot tutt at gmail dot com> 2009-08-13 10:49:32 PDT
                     Re: tree conflicts with replace neels Neels Janosch Hofmeyr 2009-08-13 11:33:18 PDT
                         Re: tree conflicts with replace Bill Tutt <bill dot tutt at gmail dot com> Bill Tutt <bill dot tutt at gmail dot com> 2009-08-13 12:22:35 PDT
                             Re: tree conflicts with replace neels Neels Janosch Hofmeyr 2009-08-13 19:18:34 PDT
                                 Re: tree conflicts with replace stsp Stefan Sperling 2009-08-13 23:05:19 PDT
                                     Re: tree conflicts with replace neels Neels Janosch Hofmeyr 2009-08-14 08:16:51 PDT
                                         Re: tree conflicts with replace stsp Stefan Sperling 2009-08-15 07:40:45 PDT
                                             Re: tree conflicts with replace markphip Mark Phippard 2009-08-15 08:18:44 PDT
                                                 Re: tree conflicts with replace stsp Stefan Sperling 2009-08-16 06:01:52 PDT
Messages per page: