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

Re: Merging not working correctly

From: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-05-08 13:21:19 CEST

On May 8, 2006, at 08:23, mal content wrote:

>>> $ svn log file:///source/cland/cpject/branches/multidir/cpj-
>>> gentarg.c
>>> --------------------------------------------------------------------
>>> --
>>> --
>>> r135 | mzero | 2006-05-07 09:56:57 +0100 (Sun, 07 May 2006) | 3
>>> lines
>>> squashed target bug (see CHANGES)
>> From the log, it looks like you squashed a bug in r135. So then you
>> must have created the branch in a different revision? Or did you do
>> both of these tasks at once?
> Yes, I believe that the branch was created, a few small fixes were
> made
> and then the whole lot was committed. I realise now that I should have
> committed the branch before touching anything!


> I did have a look through the history a bit more and found out that
> all
> changes had been committed in trunk before the branch was created.

Ok, wait, what now? In the first paragraph, you say that you created
the branch and made changes to it all in one commit. But in the
second paragraph you say that you did them in two separate commits?
Or am I misunderstanding?

> What's the course of action to be? I almost want to replace trunk with
> this new branch but I'm concerned about merging if there are going
> to be missing changes.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 8 13:22:37 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.