Mercurial > hg-stable

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 34551: (0) -30000 -10000 -3000 -1000 -300 -100 -15 +15 +100 +300 +1000 +3000 +10000 tip
age author description
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: rename conflicts to fileconflicts in _checkunknownfiles
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
Sun, 01 Oct 2017 12:21:50 +0100 Yuya Nishihara extdata: show debug message if external command exits with non-zero status
Sat, 30 Sep 2017 08:57:50 +0100 Yuya Nishihara templatekw: allow accessing to nested namespace item by its template name
Sat, 30 Sep 2017 08:50:24 +0100 Yuya Nishihara templatekw: get rid of temporary dicts from shownamespaces()
Mon, 18 Sep 2017 23:53:05 +0900 Yuya Nishihara templatekw: rename peerpaths to peerurls per naming convention (BC)
Mon, 18 Sep 2017 23:31:01 +0900 Yuya Nishihara templatekw: make experimental {peerpaths} return a single-level dict (BC)
Mon, 18 Sep 2017 23:49:05 +0900 Yuya Nishihara templatekw: fix scope of peerpath url bound to generator
less more | rev 34551: (0) -30000 -10000 -3000 -1000 -300 -100 -15 +15 +100 +300 +1000 +3000 +10000 tip