log tests/test-issue3084.t @ 41977:4ea21df312ec stable 4.9.1

age author description
Wed, 15 Apr 2015 15:22:16 -0400 Mads Kiilerich largefiles: for update -C, only update largefiles when necessary
Thu, 11 Dec 2014 21:21:21 -0800 Martin von Zweigbergk merge: move cd/dc prompts after largefiles prompts
Fri, 05 Dec 2014 16:45:52 -0800 Martin von Zweigbergk largefiles: don't use 'r' action for standin that doesn't exist
Fri, 05 Dec 2014 16:51:37 -0800 Martin von Zweigbergk largefiles: don't use 'r' action for normal file that doesn't exist
Mon, 01 Dec 2014 02:30:21 +0100 Mads Kiilerich merge: before cd/dc prompt, check that changed side really changed stable 3.2.2
Mon, 01 Dec 2014 02:11:29 +0100 Mads Kiilerich largefiles: don't show largefile/normal prompts if one side is unchanged stable
Mon, 01 Dec 2014 02:11:17 +0100 Mads Kiilerich tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged' stable
Mon, 01 Dec 2014 02:10:57 +0100 Mads Kiilerich tests: clean-up of largefiles tests in test-issue3084.t stable
Wed, 01 Oct 2014 01:04:18 +0200 Mads Kiilerich ui: show prompt choice if input is not a tty but is forced to be interactive
Sun, 24 Aug 2014 23:47:26 +0900 FUJIWARA Katsunori largefiles: update largefiles even if rebase is aborted by conflict
Mon, 21 Jul 2014 11:27:24 -0700 Danek Duvall tests: cat error messages are different on Solaris stable
Thu, 17 Jul 2014 20:17:17 -0400 Matt Harbison largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Mon, 28 Oct 2013 22:34:07 +0100 Mads Kiilerich largefiles: use 'remote'/'local' in merge prompts like in other merge prompts stable
Mon, 28 Oct 2013 22:34:05 +0100 Mads Kiilerich largefiles: systematic testing of merges to/from largefiles stable
Fri, 25 Oct 2013 02:33:59 +0800 Mads Kiilerich largefiles: don't prompt for normal/largefile changes when doing plain updates stable
Thu, 28 Feb 2013 13:45:18 +0100 Mads Kiilerich largefiles: getstandinmatcher should not depend on existence of directories stable
Wed, 23 Jan 2013 00:51:53 +0100 Benoit Boissinot largefiles: fix largefiles+subrepo update (issue3752) stable
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Fri, 09 Dec 2011 17:35:00 +0100 Martin Geisler largefiles: handle merges between normal files and largefiles (issue3084) stable