hg-stable: revision graph

graph

less more | rev 23482: (0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 tip

merge: make 'keep' message more descriptive
Wed, 03 Dec 2014 14:03:20 -0800, by Martin von Zweigbergk
addremove: restore the relative path printing when files are named
Thu, 04 Dec 2014 23:08:27 -0500, by Matt Harbison
match: introduce uipath() to properly style a file path
Thu, 04 Dec 2014 23:04:55 -0500, by Matt Harbison
merge with stable
Fri, 05 Dec 2014 12:10:56 -0600, by Matt Mackall
update: don't overwrite untracked ignored files on update stable
Sun, 16 Nov 2014 23:41:44 -0800, by Martin von Zweigbergk
update: add tests for untracked local file stable
Tue, 02 Dec 2014 17:11:01 -0800, by Martin von Zweigbergk
merge: don't overwrite conflicting file in locally renamed directory
Wed, 03 Dec 2014 11:02:52 -0800, by Martin von Zweigbergk
merge: don't ignore conflicting file in remote renamed directory
Wed, 03 Dec 2014 10:56:07 -0800, by Martin von Zweigbergk
merge: duplicate 'if f in copied' into each branch
Sun, 23 Nov 2014 15:08:50 -0800, by Martin von Zweigbergk
merge: branch code into {n1 and n2, n1, n2} top-level cases
Sun, 23 Nov 2014 14:09:10 -0800, by Martin von Zweigbergk
update: remove redundant and misplaced merge tests
Tue, 02 Dec 2014 16:39:59 -0800, by Martin von Zweigbergk
largefiles: use clearer debug messages in actions
Fri, 21 Nov 2014 13:02:45 -0800, by Martin von Zweigbergk
largefiles: don't clobber merge action message with user message
Fri, 21 Nov 2014 11:44:57 -0800, by Martin von Zweigbergk
bookmarks: factor out repository lookup from writing bookmarks file
Tue, 02 Dec 2014 20:31:19 -0800, by Ryan McElroy
parsers: ensure revlog index node tree is initialized before insertion
Thu, 04 Dec 2014 12:02:02 -0500, by Mike Edgar
revset: add 'only' to DoS-safe symbols
Wed, 03 Dec 2014 22:56:42 +0900, by Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
Wed, 03 Dec 2014 22:52:54 +0900, by Yuya Nishihara
tests: drop unnecessary glob that causes a warning on Windows
Tue, 02 Dec 2014 22:42:41 -0500, by Matt Harbison
merge: add test with conflicting file and remote directory rename
Wed, 03 Dec 2014 10:01:24 -0800, by Martin von Zweigbergk
graft: use a real conflict for the tests
Wed, 03 Dec 2014 15:03:29 -0800, by Martin von Zweigbergk
add: use lexists so that broken symbolic links are added
Wed, 03 Dec 2014 14:33:29 -0800, by John Coomes
rebase: avoid redundant repo[rev].rev() - just keep working in rev space
Tue, 02 Dec 2014 05:12:59 +0100, by Mads Kiilerich
rebase: always store rev in state, also when collapsing
Tue, 02 Dec 2014 05:12:59 +0100, by Mads Kiilerich
rebase: clarify naming of variables holding node hashes - don't call them rev
Tue, 02 Dec 2014 05:12:53 +0100, by Mads Kiilerich
bookmarks: factor out bookmark file opening for easier extensibility
Thu, 27 Nov 2014 00:24:25 -0800, by Ryan McElroy
merge with stable
Tue, 02 Dec 2014 17:19:20 -0600, by Matt Mackall
diff: explicitly honor all diffopts
Tue, 18 Nov 2014 22:18:05 -0800, by Siddharth Agarwal
annotate: explicitly only honor whitespace diffopts
Tue, 18 Nov 2014 22:16:46 -0800, by Siddharth Agarwal
notify: explicitly honor all diffopts
Tue, 18 Nov 2014 21:47:47 -0800, by Siddharth Agarwal
jsonchangeset: don't honor whitespace and format-changing diffopts
Tue, 18 Nov 2014 22:13:05 -0800, by Siddharth Agarwal
transplant: don't honor whitespace and format-changing diffopts
Tue, 18 Nov 2014 21:49:05 -0800, by Siddharth Agarwal
hgk: don't honor whitespace and format-changing diffopts
Tue, 18 Nov 2014 21:38:19 -0800, by Siddharth Agarwal
patchbomb: don't honor whitespace and format-changing diffopts (BC)
Tue, 18 Nov 2014 17:36:24 -0800, by Siddharth Agarwal
merge: add more thorough tests for --force
Wed, 26 Nov 2014 11:45:21 -0800, by Martin von Zweigbergk
merge: display modify/delete conflict prompts in sorted order
Wed, 26 Nov 2014 10:25:27 -0800, by Martin von Zweigbergk
generate-working-copy-states: accept depth arguments on command line
Sun, 09 Nov 2014 00:10:29 -0800, by Martin von Zweigbergk
generate-working-copy-states: generalize for depth
Sat, 08 Nov 2014 23:37:54 -0800, by Martin von Zweigbergk
generate-working-copy-states: make 'tracked' a string
Sat, 29 Nov 2014 14:39:33 -0800, by Martin von Zweigbergk
merge: demonstrate that directory renames can lose local file content
Tue, 02 Dec 2014 13:28:07 -0800, by Martin von Zweigbergk
mq: drop updateheader - inserthgheader and insertplainheader is enough
Fri, 28 Nov 2014 03:09:19 +0100, by Mads Kiilerich
mq: smarter handling of plain headers
Fri, 28 Nov 2014 03:09:06 +0100, by Mads Kiilerich
largefiles: drop the override for 'fetch'
Sun, 30 Nov 2014 23:30:31 -0500, by Matt Harbison
rebase: ignore negative state when updating back to original wc parent stable
Tue, 02 Dec 2014 11:06:38 -0800, by Pierre-Yves David
bundle2-push: provide transaction to reply unbundler
Fri, 21 Nov 2014 15:50:38 -0800, by Eric Sumner
bundle2.processbundle: let callers request default behavior
Mon, 24 Nov 2014 16:04:44 -0800, by Eric Sumner
push: elevate phase transaction to cover entire operation
Fri, 21 Nov 2014 15:06:38 -0800, by Eric Sumner
pull: extract transaction logic into separate object
Fri, 21 Nov 2014 14:32:57 -0800, by Eric Sumner
record: don't honor format-changing diffopts (issue4459)
Tue, 18 Nov 2014 20:00:37 -0800, by Siddharth Agarwal
patch.difffeatureopts: add a feature for format-changing diffopts
Tue, 18 Nov 2014 17:22:03 -0800, by Siddharth Agarwal
patch.difffeatureopts: add a feature for whitespace diffopts
Tue, 18 Nov 2014 17:09:26 -0800, by Siddharth Agarwal
patch.difffeatureopts: add a feature for diff.git
Tue, 18 Nov 2014 17:10:14 -0800, by Siddharth Agarwal
patch: rename diffopts to diffallopts
Tue, 18 Nov 2014 21:43:38 -0800, by Siddharth Agarwal
patch: add a new function to initialize diffopts by feature
Tue, 18 Nov 2014 16:53:22 -0800, by Siddharth Agarwal
patch.diffopts: use a dict for initialization
Tue, 18 Nov 2014 16:00:54 -0800, by Siddharth Agarwal
largefiles: split the creation of a normal matcher out of its install method
Fri, 21 Nov 2014 22:24:45 -0500, by Matt Harbison
addremove: print relative paths when called with -I/-X (BC)
Mon, 01 Dec 2014 21:48:32 -0800, by Martin von Zweigbergk
merge with stable
Mon, 01 Dec 2014 19:34:11 -0600, by Matt Mackall
merge with i18n stable
Mon, 01 Dec 2014 18:51:10 -0600, by Matt Mackall
i18n-pt_BR: synchronized with 3bd577a3283e stable
Mon, 01 Dec 2014 11:21:30 -0200, by Wagner Bruna
i18n-ja: synchronized with edf29f9c15f0 stable
Sat, 29 Nov 2014 14:32:12 +0900, by FUJIWARA Katsunori
Added signature for changeset 902554884335 stable
Mon, 01 Dec 2014 18:39:19 -0600, by Matt Mackall
Added tag 3.2.2 for changeset 902554884335 stable
Mon, 01 Dec 2014 18:39:14 -0600, by Matt Mackall
merge: before cd/dc prompt, check that changed side really changed stable 3.2.2
Mon, 01 Dec 2014 02:30:21 +0100, by Mads Kiilerich
largefiles: don't show largefile/normal prompts if one side is unchanged stable
Mon, 01 Dec 2014 02:11:29 +0100, by Mads Kiilerich
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged' stable
Mon, 01 Dec 2014 02:11:17 +0100, by Mads Kiilerich
tests: clean-up of largefiles tests in test-issue3084.t stable
Mon, 01 Dec 2014 02:10:57 +0100, by Mads Kiilerich
pushkey: gracefully handle prepushkey hook failure (issue4455) stable
Sat, 29 Nov 2014 19:17:47 -0800, by Pierre-Yves David
hook: raise a more specialized HookAbort exception when a hook fails stable
Sat, 29 Nov 2014 19:13:35 -0800, by Pierre-Yves David
help: fix typo in files help stable
Mon, 01 Dec 2014 15:04:34 -0600, by Matt Mackall
revset: fix first and last for generatorset (issue4465) stable
Mon, 01 Dec 2014 05:18:12 -0800, by Pierre-Yves David
mq: fix update of headers that occur in the "wrong" order stable
Fri, 28 Nov 2014 02:57:33 +0100, by Mads Kiilerich
subrepo: add status support for ignored files in git subrepos
Fri, 28 Nov 2014 20:16:15 +0100, by Mathias De Maré
manifest: document the extra letter in working copy manifest node
Wed, 26 Nov 2014 15:37:01 -0800, by Pierre-Yves David
hgweb: send proper HTTP response after uncaught exception stable
Fri, 28 Nov 2014 10:59:02 -0800, by Gregory Szorc
tests: test rebase of merge of target ancestors
Sun, 30 Nov 2014 20:06:53 +0100, by Mads Kiilerich
tests: test coverage of parent order with p1 outside rebase set
Sun, 30 Nov 2014 19:36:03 +0100, by Mads Kiilerich
tests: add test for rebasing merges with ancestors of the rebase destination
Sun, 30 Nov 2014 19:35:54 +0100, by Mads Kiilerich
merge: 0 is a valid ancestor different from None
Sun, 30 Nov 2014 19:26:53 +0100, by Mads Kiilerich
merge with stable
Thu, 27 Nov 2014 12:25:01 -0600, by Matt Mackall
revert: look for copy information for all local modifications stable
Tue, 25 Nov 2014 19:40:54 -0800, by Pierre-Yves David
rename: properly report removed and added file as modified (issue4458) stable
Mon, 24 Nov 2014 18:42:56 -0800, by Pierre-Yves David
manifest: fix a bug where working copy file 'add' mark was buggy stable
Wed, 26 Nov 2014 14:54:16 -0800, by Pierre-Yves David
merge: be precise about what merged into what in short desc stable
Wed, 26 Nov 2014 17:22:09 +0300, by anatoly techtonik
docker: add Docker files for running an Apache mod_wsgi server
Tue, 11 Nov 2014 20:32:10 -0800, by Gregory Szorc
merge: use None as filename for base in 'both created' conflicts
Mon, 24 Nov 2014 16:17:02 -0800, by Martin von Zweigbergk
merge: break out "both renamed a -> b" case
Mon, 24 Nov 2014 16:42:36 -0800, by Martin von Zweigbergk
merge: separate out "both created" cases
Mon, 24 Nov 2014 16:16:34 -0800, by Martin von Zweigbergk
merge: indent to prepare for next patch
Mon, 24 Nov 2014 16:11:22 -0800, by Martin von Zweigbergk
merge with stable
Tue, 25 Nov 2014 17:30:05 -0600, by Matt Mackall
factotum: convert Plan 9 quoted string to Python string
Tue, 25 Nov 2014 02:31:52 -0600, by David Eckhardt
plan9: setup check for current python build
Tue, 25 Nov 2014 02:27:31 -0600, by Jeff Sickel
add: check for the existence of a file matched inexactly before adding it
Wed, 19 Nov 2014 22:27:55 -0500, by Matt Harbison
tests: choose the proper environment variable style for the platform
Thu, 20 Nov 2014 22:33:40 -0500, by Matt Harbison
tests: fix another multi-statement hook for Windows
Thu, 20 Nov 2014 20:07:34 -0500, by Matt Harbison
run-tests: set a default largefiles usercache in the default hgrc file
Wed, 19 Nov 2014 23:41:40 -0500, by Matt Harbison
merge: remove obsolete check for untracked files in 'dm' action
Mon, 24 Nov 2014 09:50:27 -0800, by Martin von Zweigbergk

less more | rev 23482: (0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 tip

Mercurial > hg-stable

graph