After merging changes from a branch different from the working one
I could get files added on that other branch, and the svn stat
would look like:
M .
A +a_new_file
Issuing svn diff at this point doesn't include the a_new_file
content in the output. Could svn diff be instructed to
Sat, 20 Nov 2010 23:55:51 +0200, /Stanimir Stamenkov/:
Similarly, when working on a feature branch and periodically
syncing with trunk (for example) I often like to compare what I've
got changed on the branch (whether the merge hasn't gone bad, e.g.
after resolving conflicts) before committing
On Sat, Nov 20, 2010 at 11:55:51PM +0200, Stanimir Stamenkov wrote:
After merging changes from a branch different from the working one
I could get files added on that other branch, and the svn stat
would look like:
M .
A +a_new_file
Issuing svn diff at this point doesn't
