Stefan Sperling wrote on Wed, Oct 10, 2012 at 22:14:49 +0200:
> On Tue, Oct 09, 2012 at 09:10:41PM +0200, Martin Bischoff wrote:
> > Instead of merging revision N and resolving the conflicts, would a
> > record-only merge of revision N give the same result?
>
> Yes, except that record-only merges
On Tue, Oct 09, 2012 at 09:10:41PM +0200, Martin Bischoff wrote:
> Thanks a lot for the detailed information. Please see below for some
> additional questions.
Sure.
> > The incoming delete of A conflicts with the local delete of A.
> > This happened because both sides (trunk, and branch) decided
Thanks a lot for the detailed information. Please see below for some
additional questions.
On Tue, Oct 9, 2012 at 7:05 PM, Stefan Sperling wrote:
> On Tue, Oct 09, 2012 at 05:23:30PM +0200, Martin Bischoff wrote:
> > I have a project which is being developed on /trunk, and at the same
> time I
>
On Tue, Oct 09, 2012 at 05:23:30PM +0200, Martin Bischoff wrote:
> I have a project which is being developed on /trunk, and at the same time I
> have a branch (/branches/1.x) for maintenance of version 1.x.
>
> Now I'd like to rename a folder of the project, e.g. /trunk/a to /trunk/b.
> The same f
On Oct 9, 2012, at 10:23, Martin Bischoff wrote:
> What is the correct procedure to merge a rename of a folder to a branch?
Several years ago, the correct procedure was: don't. I don't know if this has
changed since then.
I have a project which is being developed on /trunk, and at the same time I
have a branch (/branches/1.x) for maintenance of version 1.x.
Now I'd like to rename a folder of the project, e.g. /trunk/a to /trunk/b.
The same folder should also be renamed on the maintenance branch, so that
future bugf
