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

Re: Show merged revisions in log

From: golan davidovits <golandav_at_yahoo.com>
Date: Sun, 21 Sep 2008 04:30:15 -0700 (PDT)

Hi Stefan,

Thanks for your replies

I'm starting to get your intention. Currently i see an inconsistent behaviour of this feature.
For example, i have tried twice a simple scenario. Create branch, do change in trunk and merge it back to branch.
The show merged revision worked only on one branch but not on the other (although it's the same test).

In addition, i continued the test and made a change in branch and tried to "reintegrate" it back to trunk.
The result was the following error:

Error: Cannot reintegrate from <branch> yet
Error: Some revisions have been merged under it that have not been merged
Error: into the reintegration target; merge them first, then retry.

Can you please explain why it happens?? No new revision was added to the trunk since my trunk>branch merge.

Thanks,
gzd

----- Original Message ----
From: Stefan Küng <tortoisesvn_at_gmail.com>
To: users_at_tortoisesvn.tigris.org
Sent: Sunday, September 21, 2008 12:09:26 PM
Subject: Re: Show merged revisions in log

golan davidovits wrote:
> But the merged revisions are always coming from another branch. How
> do i know about a gray revision from what branch it came from and
> what revisions from the source branch were mereged?

The revisions are shown in the revision column. The revision shown for
the merged revisions (shown in gray) are the revisions that were merged.

And if you click on such a revision in the top pane of the log dialog,
the bottom pane will show you the paths that were affected in that revision.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
(_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\    http://tortoisesvn.net
      
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-21 13:30:31 CEST

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