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

Re: Merge problem with project file.

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 22 Jul 2008 21:08:33 +0200

Chris Convents wrote:
> Hi all,
> During a merge activity we encountered some problems merging our project
> file (CEPAP.vpj) from branch br_gv_02 to the Trunk.

What was the problem?

> After some investigations we think we found the reason. If you look at
> the revision graph included you see the first Trunk rev. of the file
> being created at revision 113 based on branch revision 111.
> We were trying to merge revision 112 to the trunk, but this would not
> work. I think it fails because the trunk was created from rev.111. We
> don’t understand how you can actually create the situation as shown in
> the revision graph.
> Why isn’t the trunk revision at 112 i.s.o. 113? Looks like the trunk
> revision got created from an older revision (111) then the HEAD revision
> at that moment.

That's not uncommon: you can create a tag/branch from r1 if you like. If
you look at the branch/tag dialog, you see that you can specify the
revision from where the branch/tag should be created.

Also, the branch/tag dialog defaults to the revision your working copy
is on. If you haven't updated before opening that dialog, then you will
create the branch/tag from an earlier revision than HEAD (if you don't
check the HEAD radio button). That's to avoid tagging something you
don't want (you don't want to tag a change you have not in your working
copy and already tested).


P.S. there's no need to create a screenshot: the revision graph window
has a file->save menu where you can save the graph as an image file
(defaults to *.wmf, but you can specify .jpg, .gif, .png, ...)

   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-22 21:08:54 CEST

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.