All pastes #2110356 Raw Edit

Anonymous

public text v1 · immutable
#2110356 ·published 2012-02-06 16:18 UTC
rendered paste body
in branch:

$ svn log -r 19476:HEAD <somefile>.php 
------------------------------------------------------------------------
r19476 | him | 2012-01-27 17:14:24 +0200 (Fri, 27 Jan 2012) | 1 line

made a copy
------------------------------------------------------------------------
r19480 | me | 2012-01-27 17:24:31 +0200 (Fri, 27 Jan 2012) | 2 lines

Committed all changes made by <him> so far

------------------------------------------------------------------------


In trunk:

$ svn log -r 19476:HEAD <samefile>.php 
------------------------------------------------------------------------
r19514 | him | 2012-01-30 14:54:49 +0200 (Mon, 30 Jan 2012) | 2 lines

<some commit message>
------------------------------------------------------------------------
r19517 | him | 2012-01-30 15:51:46 +0200 (Mon, 30 Jan 2012) | 1 line

<some commit message>
------------------------------------------------------------------------

Back to branch:

$ svn merge <path-to-trunk>
$ 

It should be noted that other changes have been merged. Example:
In branch:
$ svn log -r 19476:HEAD <some other file>.php
------------------------------------------------------------------------
r19476 | him | 2012-01-27 17:14:24 +0200 (Fri, 27 Jan 2012) | 1 line

made a copy
------------------------------------------------------------------------
r19480 | me | 2012-01-27 17:24:31 +0200 (Fri, 27 Jan 2012) | 2 lines

Committed all changes made by <him> so far

------------------------------------------------------------------------
r19550 | me | 2012-01-31 12:42:20 +0200 (Tue, 31 Jan 2012) | 2 lines

Merged in changes from trunk

------------------------------------------------------------------------
r19580 | me | 2012-02-01 13:59:11 +0200 (Wed, 01 Feb 2012) | 2 lines

Merged in changes from trunk

------------------------------------------------------------------------
r19672 | me | 2012-02-06 10:48:37 +0200 (Mon, 06 Feb 2012) | 2 lines

Merged in changes from trunk

------------------------------------------------------------------------

In trunk:
$ svn log -r 19476:HEAD <same other file>.php 
------------------------------------------------------------------------
r19524 | him | 2012-01-30 17:24:38 +0200 (Mon, 30 Jan 2012) | 1 line

<some commit message>
------------------------------------------------------------------------
r19573 | him | 2012-02-01 11:31:14 +0200 (Wed, 01 Feb 2012) | 2 lines

<some commit message>
------------------------------------------------------------------------
r19603 | him | 2012-02-02 11:11:50 +0200 (Thu, 02 Feb 2012) | 1 line

<some commit message>
------------------------------------------------------------------------
r19630 | him | 2012-02-03 11:32:23 +0200 (Fri, 03 Feb 2012) | 1 line

<some commit message>
------------------------------------------------------------------------