Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Patrick Mezard
- Mon, 21 Jan 2008 13:15:38
Show More
hgext/convert/subversion.py
0
+1
-1
@@
-598,7
+598,7
b' class svn_source(converter_source):'
598
598
copies [ self . recode ( copyto_entry )] = self . recode ( entry )
599
599
# copy from quux splort/quuxfile
600
600
601
return ( entries , copies )
601
return ( util . unique ( entries ) , copies )
602
602
603
603
def _fetch_revisions ( self , from_revnum , to_revnum ):
604
604
if from_revnum < to_revnum :
mercurial/localrepo.py
0
+2
0
@@
-687,6
+687,8
b' class localrepository(repo.repository):'
687
687
p1 = None , p2 = None , extra = {}, empty_ok = False ):
688
688
wlock = lock = tr = None
689
689
valid = 0 # don't save the dirstate if this isn't set
690
if files :
691
files = util . unique ( files )
690
692
try :
691
693
commit = []
692
694
remove = []
tests/test-convert-svn-branches.out
0
+1
-1
@@
-89,7
+89,7
b' o 9 branch trunk@1 into old2 files:'
89
89
| | |
90
90
| o | 3 change letter files: letter.txt
91
91
| | |
92
+---o 2 branch trunk, remove letter3 files: letter.txt letter.txt letter2.txt letter2.txt
92
+---o 2 branch trunk, remove letter3 files: letter.txt letter2.txt
93
93
| |
94
94
| o 1 hello files: letter.txt letter2.txt letter3.txt
95
95
|/
tests/test-convert-svn-source
0
+6
-3
@@
-103,13
+103,16
b' hg convert $svnurl A-hg'
103
103
echo % update svn repository again
104
104
cd A
105
105
echo "see second letter" >> letter.txt
106
echo "nice to meet you" > letter2.txt
107
svn add letter2.txt
106
# Put it in a subdirectory to test duplicate file records
107
# from svn source (issue 714)
108
mkdir todo
109
echo "nice to meet you" > todo/letter2.txt
110
svn add todo
108
111
svn ci -m "second letter"
109
112
110
113
svn copy -m "tag v0.2" $svnurl/trunk $svnurl/tags/v0.2
111
114
112
echo "blah-blah-blah" >> letter2.txt
115
echo "blah-blah-blah" >> todo/ letter2.txt
113
116
svn ci -m "work in progress"
114
117
cd ..
115
118
tests/test-convert-svn-source.out
0
+7
-5
@@
-82,14
+82,16
b' 1 world'
82
82
0 nice day
83
83
updating tags
84
84
% update svn repository again
85
A letter2.txt
85
A todo
86
A todo/letter2.txt
86
87
Sending letter.txt
87
Adding letter2.txt
88
Adding todo
89
Adding todo/letter2.txt
88
90
Transmitting file data ..
89
91
Committed revision 9.
90
92
91
93
Committed revision 10.
92
Sending letter2.txt
94
Sending todo/ letter2.txt
93
95
Transmitting file data .
94
96
Committed revision 11.
95
97
% test incremental conversion
@@
-101,9
+103,9
b' 0 work in progress'
101
103
updating tags
102
104
o 7 update tags files: .hgtags
103
105
|
104
o 6 work in progress files: letter2.txt
106
o 6 work in progress files: todo/ letter2.txt
105
107
|
106
o 5 second letter files: letter.txt letter2.txt
108
o 5 second letter files: letter.txt todo/ letter2.txt
107
109
|
108
110
o 4 update tags files: .hgtags
109
111
|
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages