Mercurial > hg
comparison tests/test-subrepo.t @ 22590:d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 01 Oct 2014 01:08:17 +0200 |
| parents | 764adc332f6e |
| children | bbe56e07e07a |
comparison
equal
deleted
inserted
replaced
| 22589:9ab18a912c44 | 22590:d4c972b97fee |
|---|---|
| 974 e95bcfa18a35+ | 974 e95bcfa18a35+ |
| 975 $ hg update tip | 975 $ hg update tip |
| 976 subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) | 976 subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) |
| 977 (M)erge, keep (l)ocal or keep (r)emote? m | 977 (M)erge, keep (l)ocal or keep (r)emote? m |
| 978 subrepository sources for s differ | 978 subrepository sources for s differ |
| 979 use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? | 979 use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? l |
| 980 l | |
| 981 subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) | 980 subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) |
| 982 (M)erge, keep (l)ocal or keep (r)emote? m | 981 (M)erge, keep (l)ocal or keep (r)emote? m |
| 983 subrepository sources for t differ | 982 subrepository sources for t differ |
| 984 use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? | 983 use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? l |
| 985 l | |
| 986 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 984 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 987 $ hg id | 985 $ hg id |
| 988 925c17564ef8+ tip | 986 925c17564ef8+ tip |
| 989 $ hg -R s id | 987 $ hg -R s id |
| 990 fc627a69481f+ | 988 fc627a69481f+ |
| 1011 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) | 1009 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
| 1012 (M)erge, keep (l)ocal or keep (r)emote? m | 1010 (M)erge, keep (l)ocal or keep (r)emote? m |
| 1013 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) | 1011 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) |
| 1014 (M)erge, keep (l)ocal or keep (r)emote? m | 1012 (M)erge, keep (l)ocal or keep (r)emote? m |
| 1015 subrepository sources for t differ (in checked out version) | 1013 subrepository sources for t differ (in checked out version) |
| 1016 use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? | 1014 use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? l |
| 1017 l | |
| 1018 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1015 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1019 $ hg id | 1016 $ hg id |
| 1020 e45c8b14af55+ | 1017 e45c8b14af55+ |
| 1021 $ hg -R s id | 1018 $ hg -R s id |
| 1022 02dcf1d70411 | 1019 02dcf1d70411 |
| 1036 7af322bc1198+ | 1033 7af322bc1198+ |
| 1037 $ hg update tip | 1034 $ hg update tip |
| 1038 subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) | 1035 subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) |
| 1039 (M)erge, keep (l)ocal or keep (r)emote? m | 1036 (M)erge, keep (l)ocal or keep (r)emote? m |
| 1040 subrepository sources for s differ | 1037 subrepository sources for s differ |
| 1041 use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)? | 1038 use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)? l |
| 1042 l | |
| 1043 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) | 1039 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) |
| 1044 (M)erge, keep (l)ocal or keep (r)emote? m | 1040 (M)erge, keep (l)ocal or keep (r)emote? m |
| 1045 subrepository sources for t differ | 1041 subrepository sources for t differ |
| 1046 use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? | 1042 use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? l |
| 1047 l | |
| 1048 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1043 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1049 $ hg id | 1044 $ hg id |
| 1050 925c17564ef8+ tip | 1045 925c17564ef8+ tip |
| 1051 $ hg -R s id | 1046 $ hg -R s id |
| 1052 02dcf1d70411+ | 1047 02dcf1d70411+ |