Mercurial > hg

log tests/test-merge-subrepos.t @ 48642:009e86022a9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 16 Apr 2021 16:21:26 -0700 Kyle Lippincott chg: pass --no-profile to disable profiling when starting hg serve
Mon, 08 Mar 2021 17:32:22 +0100 Pierre-Yves David tests: clarify some missing output in test-merge-subrepos
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Sat, 15 Dec 2018 17:52:14 +0900 Yuya Nishihara tests: filter out uninteresting log events
Sun, 26 Aug 2018 19:14:26 +0300 Pulkit Goyal filemerge: fix the wrong placements of messages in prompt
Sat, 25 Aug 2018 21:17:34 +0300 Pulkit Goyal filemerge: print the filename in quotes in prompt
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550)
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Sat, 11 Nov 2017 12:40:13 +0900 Yuya Nishihara dispatch: verify result of early command parsing stable
Tue, 03 Oct 2017 13:05:58 -0700 Saurabh Singh test-merge-subrepos: make test compatible with chg
Sun, 09 Jul 2017 16:38:04 -0400 Matt Harbison test-subrepo: demonstrate a status problem when merge deletes a file
Sun, 09 Jul 2017 16:13:30 -0400 Matt Harbison subrepo: make the output references to subrepositories consistent
Sun, 09 Jul 2017 02:55:46 -0400 Matt Harbison subrepo: consider the parent repo dirty when a file is missing
Sun, 09 Jul 2017 00:05:31 -0400 Matt Harbison tests: tweak the subrepo dirty state tests
Wed, 28 Jun 2017 21:30:46 -0400 Matt Harbison tests: demonstrate inconsistencies with dirty state in various commands
Mon, 23 Sep 2013 20:53:14 -0700 Siddharth Agarwal merge: standardize error message for dirty subrepo
Wed, 16 Feb 2011 08:56:11 -0800 Oleg Stepanov Do not allow merging with uncommitted changes in a subrepo stable
less more | (0) tip