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

Re: MERGE: Command Line Results Different from TortoiseSVN Results

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Thu, 15 Jan 2015 10:09:39 -0600

On Thu, Jan 15, 2015 at 3:53 AM, Marcia Almeida Rocha <
Marcia.Rocha_at_wedotechnologies.com> wrote:
>
> Hello Gavin
>
> The results are not the same, because TSVN shows revision 610 as not
merged. You're right , this revision is previous than branch creation, but
when branch was created, the revision 610 was not merged yet. In that
moment, command line has listed it as not merged and TSVN too. After, I've
merged revision 610 and the command line does not show it, but TSVN shows
it.
>
>

I think Gavin meant, "previous in the revision graph" not "previous in
time".

Do these branches not share any ancestry, somehow? How did you create your
branch?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3094315

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-15 17:10:20 CET

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

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