Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:
> Hi tree-conflicts folks,
> merge notification is starting to look really nice.
> It is only implemented for the repos-diff editor in repos_diff.c, not for
> the other ones. In fact, merge only uses the repos-diff one, so it's
> obsolete to implement tree-conflicts notification for the wc-diff editor,
> when no-one using the wc-diff editor is ever raising a tree conflict to be
> notified with it.
> `svn status' fails to note some tree-conflicts, but that was there before.
To check the status of 'missing' victims, use the helper function
> So there only is some freak output status=' U' on some tree-conflicts
> notifications, seen in some tests that I have left failing for now, and e.g.
> in merge_tests.py 144 (tree_conflicts_on_merge_local_ci_5_1). These will go
> away as soon as I implement sbutler's suggestion to not use a flag in
> notify_t, but a new notify_action enum field for tree-conflicts
> notification. I'm intending to do that on trunk because it also affects the
> update/switch code.
The ' U', 'D ', etc. appear in the output because we're not yet
skipping tree conflict victims (or their descendants).
> Can you guys find issues that would prevent merging tc-merge-notify back to
> trunk now?
No, I think it's up to par with the update code now. Merge away!
> (Oh, and meta about merging: stsp told me once to use `merge --reintegrate',
> but I've read somewhere that there are problems with that and one should
> rather use two-URL merge. Steve, which commands did you use to merge that
> other branch back to trunk? Did you copy-paste the commit logs over,
> and how?)
I ran the usual
svn merge $trunk
to update the branch, and noted the highest revnum on trunk. Then
to do the actual merge, I ran the 2-url merge
svn merge $trunk@$revnum $branch
because there's mergeinfo on subtrees, which --reintegrate can't
(yet) accept. The commit message was perhaps overkill. I put most
of it together by copy-paste from the branch log. I generally
write the log message in advance, then use 'svn ci -F'. Which
gives other people a chance to commit to trunk in the meantime,
which is why I specified the trunk revnum in the final merge cmd,
on a tip from hwright.
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-30 11:15:39 CET