Mercurial > hg > mercurial-crew

comparison tests/test-largefiles.t @ 25903:6084926366b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: move the parents phase marker to commit line (issue4688) The phase of the pending commit depends on the parent of the working directory and on the phases.newcommit configuration. First, this information rather depend on the commit line which describe the pending commit. Then, we only want to be advertised when the pending phase is going to be higher than the default new commit phase. So the format will change from $ hg summary parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) update: (current) phases: 1 secret (secret) to parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret) update: (current) phases: 1 secret
author Gilles Moris <gilles.moris@free.fr>
date Fri, 29 May 2015 22:23:58 +0200
parents 4b61521c3db0
children 4d2b9b304ad0
comparison
equal deleted inserted replaced
25902:47edeff19139 25903:6084926366b9
69 parent: 1:ce8896473775 tip 69 parent: 1:ce8896473775 tip
70 edit files 70 edit files
71 branch: default 71 branch: default
72 commit: (clean) 72 commit: (clean)
73 update: (current) 73 update: (current)
74 phases: 2 draft (draft) 74 phases: 2 draft
75 largefiles: (no remote repo) 75 largefiles: (no remote repo)
76 76
77 Commit preserved largefile contents. 77 Commit preserved largefile contents.
78 78
79 $ cat normal1 79 $ cat normal1
1002 parent: 0:30d30fe6a5be 1002 parent: 0:30d30fe6a5be
1003 add files 1003 add files
1004 branch: default 1004 branch: default
1005 commit: (clean) 1005 commit: (clean)
1006 update: 7 new changesets (update) 1006 update: 7 new changesets (update)
1007 phases: 8 draft (draft) 1007 phases: 8 draft
1008 1008
1009 $ rm "${USERCACHE}"/* 1009 $ rm "${USERCACHE}"/*
1010 $ hg clone --all-largefiles -u 1 a a-clone1 1010 $ hg clone --all-largefiles -u 1 a a-clone1
1011 updating to branch default 1011 updating to branch default
1012 getting changed largefiles 1012 getting changed largefiles
1025 parent: 1:ce8896473775 1025 parent: 1:ce8896473775
1026 edit files 1026 edit files
1027 branch: default 1027 branch: default
1028 commit: (clean) 1028 commit: (clean)
1029 update: 6 new changesets (update) 1029 update: 6 new changesets (update)
1030 phases: 8 draft (draft) 1030 phases: 8 draft
1031 1031
1032 $ rm "${USERCACHE}"/* 1032 $ rm "${USERCACHE}"/*
1033 $ hg clone --all-largefiles -U a a-clone-u 1033 $ hg clone --all-largefiles -U a a-clone-u
1034 11 additional largefiles cached 1034 11 additional largefiles cached
1035 $ hg -R a-clone-u sum 1035 $ hg -R a-clone-u sum
1036 parent: -1:000000000000 (no revision checked out) 1036 parent: -1:000000000000 (no revision checked out)
1037 branch: default 1037 branch: default
1038 commit: (clean) 1038 commit: (clean)
1039 update: 8 new changesets (update) 1039 update: 8 new changesets (update)
1040 phases: 8 draft (public) 1040 phases: 8 draft
1041 1041
1042 Show computed destination directory: 1042 Show computed destination directory:
1043 1043
1044 $ mkdir xyz 1044 $ mkdir xyz
1045 $ cd xyz 1045 $ cd xyz