Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > tree-conflicts ng

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

tree-conflicts ng

Author neels
Full name Neels Janosch Hofmeyr
Date 2009-09-15 16:41:24 PDT
Message Hi tree-conflicts folks,

I'd like to poke you guys with this scenario:

[[[
# fred's WC: copy, edit and remove something in three separate commits.
$ svn copy foo bar ; svn ci
$ $EDITOR bar ; svn ci
$ svn delete foo ; svn ci


# elaine's WC has a local mod on 'foo', and needs to get the new changes.
# she's about to face a tree-conflict.
$ svn st
M foo

$ svn up
    C foo
    > local edit, incoming move to ^/bar
A + bar (moved from ^/foo)
M bar
Summary of conflicts:
  Tree conflicts: 1
# in a sidenote, the above copy+del results in a move

$ svn st
D C foo
    > local edit, incoming move to ^/bar

$ svn resolve foo
Resolving tree-conflict on 'foo': local edit, incoming move to ^/bar
 (mt) apply mine to move-target (^/bar), (tf) discard mine/"theirs-full",
 (a) see all options? mt
M bar
D foo
Resolved conflicted state of ^/foo

$ svn st
M bar
$ svn ci -m "frobnicate."
]]]

~Neels
Attachments
signature.asc

« Previous message in topic | 1 of 6 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
tree-conflicts ng neels Neels Janosch Hofmeyr 2009-09-15 16:41:24 PDT
     Re: tree-conflicts ng markphip Mark Phippard 2009-09-15 16:48:23 PDT
     Re: tree-conflicts ng stsp Stefan Sperling 2009-09-16 02:25:08 PDT
     Re: tree-conflicts ng julianfoad Julian Foad 2009-09-16 02:54:50 PDT
         Re: tree-conflicts ng brane Branko Cibej 2009-09-16 03:34:31 PDT
             Re: tree-conflicts ng julianfoad Julian Foad 2009-09-16 03:57:44 PDT
Messages per page: