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

Re: Commit parts of a merge and leave the rest marked as unmerged for someone else

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Mon, 14 Sep 2009 09:00:12 +0100

> From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
> Sent: den 13 september 2009 09:05
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: Commit parts of a merge and leave the rest marked as unmerged for someone else
>
>>> I can think of a few hackish methods to do this, involving manipulation
>>> of mergeinfo and other bad mojo, but I'd really rather not.
>
>> Wouldn't the option "ignore ancestry" when merging ignore the mergeinfo
>> and just do the merge?
>> http://svnbook.red-> bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.nomergedata
>
>
> I guess so, but that is not what I want as far as I can tell?
>
> I want subversion to help me keep track of merges and revisions and generally do its job - but I want to be able to leave the conflicted part of the merge uncommitted so to speak, and when someone else remakes the same merge, that person should be able to repeat the result and get the same conflicts.
>
>
> BR / Kristoffer

I don't think that's possible, but your best bet would be to ask on
the subversion users list since this is a basic subversion feature you
are asking about and you may get a lot more replies there.

Simon

-- 
:       ___
:  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=2394469
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-14 10:00:32 CEST

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