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
