Subversion generally does a good job of pulling updates from an upstream repository and merging in your local modifications, but sometimes subversion cannot handle the changes.
Subversions response to these eventualities has change dramatically in 1.5
Before version 1.5 you wound up with a log and a bunch of files with names such as configure.php configure.php.mine configure.php.r1234 configure.php.r2100 and you got to manually search through the tree manually merge the files in question and remember to delete the .mine .r[old number] .r[new number] files.
With 1.5 you get the following prompt:
Conflict discovered in 'htaccess.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: h
(p) postpone - mark the conflict to be resolved later
(df) diff-full - show all changes made to merged file
(e) edit - change merged file in an editor
(r) resolved - accept merged version of file
(mf) mine-full - accept my version of entire file (ignore their changes)
(tf) theirs-full - accept their version of entire file (lose my changes)
(l) launch - launch external tool to resolve conflict
(h) help - show this list
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options:
I have not checked to see if the old behavior is available for cron jobs. But it greatly improves interactive updates from an upstream repository
Login with Facebook (Site)
