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

Re: Feature Req: ability to specify a changelist for svn merge

From: Edwin Castro <0ptikGhost_at_gmx.us>
Date: Thu, 22 Aug 2013 13:51:50 -0700

On 8/22/13 6:55 AM, James Hanley wrote:
> ie:
> svn merge -cl merge_from_trunk https://svn.somerepo.com/project/trunk
> #Any items merged in are added to change list "merge_from_trunk" to
> # easily differentiate from local changes that the user does not want
> to check in
> svn status
> M local_file_changes.txt
> --- Changelist 'merge_from_trunk':
> M .
> M pathhere/foo.c
> M pathhere/bar.c
> A + paththere/mon.h
> M paththere/mon.cpp
> M pathoverthere/foo
> This would then allow just the easy checkin of the merge with
> svn ci -cl merge_from_trunk
> alternatively (if easier to implement) the ability to specify to svn
> ci the set of files not specified as a member to a changelist.
> -Jim

Out of curiosity, what do you propose should happen if the merge needs
to make changes to local_file_changes.txt?

Edwin G. Castro
Received on 2013-08-22 22:52:45 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.