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

RE: Re: issues with merge depth

From: walter klust <wklust_at_elego.de>
Date: Tue, 5 Feb 2013 06:05:38 -0800 (PST)

This is what I did:

- create repo with trunk/ and branches/
- checkout working copy
- from trunk HEAD create branch branches/br1 and switch to it
- in br1 create
  - br1/t0.txt
  - br1/d1/
  - br1/d1/t1.txt
  - br1/d1/d2/
  - br1/d1/d2/t2.txt
- add, commit, switch back to trunk
- Start a merge of br1 to trunk:
-- select "Merge type: Merge a range of revisions"
- commit
-- in commit dialog:
--- deselect d2 and t2.txt
--- click Ok

Then the Messagebox pops up (1.7.3) or not (1.7.5+)

Screenshot should be attached.

Walter

> On 31.01.2013 12:05, walter klust wrote:
>
> >>>> Implemented a message box before the actual commit in r21656.
> >>>>
> >>>> Stefan
> >>>
> >>> The message box seems to be missing with TSVN 1.7.11 r23600
> >>>
> >>> It was there at least until TSVN 1.7.3
> >>
> >> Nope, it wasn't.
> >>
> >
> > Yes its was :-)
>
> No, really, it wasn't: r21656 never got merged to 1.7.x.
> Which means you're talking about a different issue and dialog box.
>
> >
> > Please find a screenshot attached where you can see it using TSVN 1.7.4
>
> you forgot to attach the screenshot.
>
> > Starting with TSVN 1.7.5 this message box is missing. I validated this by testing several TSVN versions today using the same process (trying to commit parts of a merged branch)
> >
> > As far as i remember this feature was added to an unoffical 1.6.99 version which then became the 1.7 line.
>
> Since it appears that we're not talking about the same here:
> Please describe exactly the state of your working copy, what you're
> trying to do (commit something obviously, but what do you check and what
> uncheck for the commit) and why you expect a dialog.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest interface to (Sub)version control
> /_/ \_\ http://tortoisesvn.net

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

nonrecmb.JPG
Received on 2013-02-05 15:05:48 CET

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