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

RE: TSVN - Merge Tracking

From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 9 Nov 2009 18:04:24 -0500

> On Tue, Nov 10, 2009 at 8:47 AM, Bob Archer <bob.archer_at_amsi.com>
> wrote:
> > IF you do the following:
> >
> > o Right click on your WC
> > o Select Merge
> > o Leave Merge Type of Merge Range of Revisions
> > o Click Next
> > o Specify a URL to merge from
> > o Click "Show Log"
> >
> > It is here where you will see the already merged in revisions as
> grayed out. I think you will have to specify the "INclude merged
> revisions" at the bottom to see the grayed out ones. Otherwise it
> will only show revisions that are eligible to merge.
>
> Thanks, Bob. When I view the "Show Log" of the URL to merge from, I
> see all revisions (including ones that have already been merged).
> The
> "Include merged revisions" option does not seem to do anything with
> the log for the source. If I use that option on that target though
> (the branch where I have already merged revisions into), then it
> includes the log of the merged revisions. This seems to be
> consistent
> with the TSVN help (4.9.6 Merge Tracking Features), and the manual.

Right, wouldn't you always start your merge by right click on the target? I should have said that as the first step... you right click on the merge target working copy.... as that is the location that TSVN will read the mergeinfo from.

BOb

>
> In the TSVN help as well (same section as above), the screenshot
> shows
> the merged revisions in grey, whereas on my machine, they are
> continually appearing in the standard black font (even though they
> are
> indented).
>
> Regards,
> Daniel B.
>
> >> -----Original Message-----
> >> From: Daniel Becroft [mailto:djcbecroft_at_gmail.com]
> >> Sent: Monday, November 09, 2009 5:27 PM
> >> To: users_at_tortoisesvn.tigris.org
> >> Subject: Re: TSVN - Merge Tracking
> >>
> >> On Tue, Nov 10, 2009 at 12:40 AM, Bob Archer
> <bob.archer_at_amsi.com>
> >> wrote:
> >> > Look at the properties on the WC folder that you are merging
> >> into. If you don't see any svn:mergeinfo property there then as
> far
> >> as TSVN knows you haven't merged anything in yet.
> >> >
> >> > BOb
> >>
> >> Thanks, Bob. That was the first thing that I checked.
> >>
> >> There is the 'svn:mergeinfo' property on the root WC folder (and
> >> there's also one on a folder a couple of levels down due to
> >> erroneous
> >> merging, but we hope to remove that soon).
> >>
> >>  - If I run 'svn mergeinfo --show-revs merged' or 'svn mergeinfo
> >> --show-revs eligible' for the same source/target URLs, AND from
> the
> >> same working copy, the revisions appear where they are supposed
> to
> >> be.
> >>  - If I go TortoiseSVN > Show Log from the target WC, and select
> >> the
> >> "Include merged revisions" option, then the merged revisions are
> >> correctly shown, indented under the revision that actually
> >> performed
> >> the merge (Note: They are still in a black font, though. Not
> sure
> >> if
> >> they should be grey here).
> >>  - If I attempt to merge in a revision that has already been
> >> merged,
> >> then the merge is performed, but no files are actually changed.
> >>
> >> Everything seems to be working from a functional point of view,
> but
> >> I
> >> still cannot determine where these revisions are supposed to be
> >> displayed as grey (as it says in the TSVN manual).
> >>
> >> Regards,
> >> Daniel B.
> >>
> >> _____________________________________
> >> > From: Daniel Becroft [djcbecroft_at_gmail.com]
> >> > Sent: Sunday, November 08, 2009 7:30 PM
> >> > To: users_at_tortoisesvn.tigris.org
> >> > Subject: TSVN - Merge Tracking
> >> >
> >> > Hi,
> >> >
> >> > We have (finally) started to utilise the merge functionality
> in
> >> SVN,
> >> > and I have a couple of questions regard the Merge Tracking
> >> > functionality in TSVN.
> >> >
> >> > In the manual, it states:
> >> >
> >> > (URL :
> http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-
> >> dug-merge.html#tsvn-dug-merge-tracking)
> >> > (3rd dot point) "When you show the log dialog from within the
> >> merge
> >> > dialog, revisions already merged are shown in grey."
> >> >
> >> > Which log dialog is being referred to here? Is it the log for
> the
> >> > working copy, or the URL to merge from? Either way, I am not
> >> seeing
> >> > any of the revisions displaying in grey (even ones which I
> know
> >> have
> >> > already been merged to the target). If I view the log for the
> >> target,
> >> > I am correctly seeing the indenting for the merged revisions
> (but
> >> > these are still displaying as black, not grey).
> >> >
> >> > Also, is this revision coloring TSVNs implementation of the
> 'svn
> >> > mergeinfo --show-revs' command (grey revisions are merged,
> black
> >> are
> >> > eligible)? If not, is there an implementation of this in TSVN?
> >> >
> >> > Environment: TSVN v1.6.6 (Build 17493), WinXP SP3, Windows
> >> 'Classic'
> >> > theme (if that matters)
> >> >
> >> > Regards,
> >> > ---
> >> > Daniel Becroft
> >> >
> >> > ------------------------------------------------------
> >> >
> >>
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> >> ssageId=2415641
> >> >
> >> > To unsubscribe from this discussion, e-mail: [users-
> >> unsubscribe_at_tortoisesvn.tigris.org].
> >> >
> >> > ------------------------------------------------------
> >> >
> >>
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> >> ssageId=2415800
> >> >
> >> > To unsubscribe from this discussion, e-mail: [users-
> >> unsubscribe_at_tortoisesvn.tigris.org].
> >> >
> >>
> >> ------------------------------------------------------
> >>
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> >> ssageId=2415936
> >>
> >> To unsubscribe from this discussion, e-mail: [users-
> >> unsubscribe_at_tortoisesvn.tigris.org].
> >
> > ------------------------------------------------------
> >
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> ssageId=2415943
> >
> > To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_tortoisesvn.tigris.org].
> >
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMe
> ssageId=2415947
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_tortoisesvn.tigris.org].

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-10 00:04:31 CET

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