Mercurial > hg-stable

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 34550: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 tip
age author description
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add _checkunknowndirs function for detecting path conflicts
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: backup conflicting directories when getting files
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'pr' to rename files during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'p' to record path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas commands: update the resolve command to handle path conflicts
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add pathconflict merge state
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas tests: add a test demonstrating basic path conflict failures
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas scmutil: handle conflicting files and dirs in origbackuppath
less more | rev 34550: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 tip