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
On 22.08.2013 15:55, 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
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_tru