upstream/mercurial-mirror Commit - r10265:0d8577e1

1

#!/bin/sh

1

#!/bin/sh

2

3

cat > writepatterns.py <<EOF

3

cat > writepatterns.py <<EOF

4

import sys

4

import sys

5

6

path = sys.argv[1]

6

path = sys.argv[1]

7

patterns = sys.argv[2:]

7

patterns = sys.argv[2:]

8

9

fp = file(path, 'wb')

9

fp = file(path, 'wb')

10

for pattern in patterns:

10

for pattern in patterns:

11

count = int(pattern[0:-1])

11

count = int(pattern[0:-1])

12

char = pattern[-1] + '\n'

12

char = pattern[-1] + '\n'

13

fp.write(char*count)

13

fp.write(char*count)

14

fp.close()

14

fp.close()

15

EOF

15

EOF

16

17

echo % prepare repo

17

echo % prepare repo

18

hg init a

18

hg init a

19

cd a

19

cd a

20

21

# These initial lines of Xs were not in the original file used to generate

21

# These initial lines of Xs were not in the original file used to generate

22

# the patch. So all the patch hunks need to be applied to a constant offset

22

# the patch. So all the patch hunks need to be applied to a constant offset

23

# within this file. If the offset isn't tracked then the hunks can be

23

# within this file. If the offset isn't tracked then the hunks can be

24

# applied to the wrong lines of this file.

24

# applied to the wrong lines of this file.

25

python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A

25

python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A

26

hg commit -Am adda

26

hg commit -Am adda

27

28

# This is a cleaner patch generated via diff

28

# This is a cleaner patch generated via diff

29

# In this case it reproduces the problem when

29

# In this case it reproduces the problem when

30

# the output of hg export does not

30

# the output of hg export does not

31

echo % import patch

31

echo % import patch

32

hg import -v -m 'b' -d '2 0' - <<EOF

32

hg import -v -m 'b' -d '2 0' - <<EOF

33

--- a/a 2009-12-08 19:26:17.000000000 -0800

33

--- a/a 2009-12-08 19:26:17.000000000 -0800

34

+++ b/a 2009-12-08 19:26:17.000000000 -0800

34

+++ b/a 2009-12-08 19:26:17.000000000 -0800

35

@@ -9,7 +9,7 @@

35

@@ -9,7 +9,7 @@

36

A

36

A

37

A

37

A

38

B

38

B

39

-A

39

-A

40

+a

40

+a

41

A

41

A

42

A

42

A

43

A

43

A

44

@@ -53,7 +53,7 @@

44

@@ -53,7 +53,7 @@

45

A

45

A

46

A

46

A

47

B

47

B

48

-A

48

-A

49

+a

49

+a

50

A

50

A

51

A

51

A

52

A

52

A

53

@@ -75,7 +75,7 @@

53

@@ -75,7 +75,7 @@

54

A

54

A

55

A

55

A

56

B

56

B

57

-A

57

-A

58

+a

58

+a

59

A

59

A

60

A

60

A

61

A

61

A

62

EOF

62

EOF

63

64

echo % compare imported changes against reference file

64

echo % compare imported changes against reference file

65

python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A

65

python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A

66

diff -u aref a

66

diff aref a

67

	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

             #!/bin/sh
             cat > writepatterns.py <<EOF
             import sys
             path = sys.argv[1]
             patterns = sys.argv[2:]
             fp = file(path, 'wb')
             for pattern in patterns:
                 count = int(pattern[0:-1])
                 char = pattern[-1] + '\n'
                 fp.write(char*count)
             fp.close()
             EOF
             echo % prepare repo
             hg init a
             cd a
             # These initial lines of Xs were not in the original file used to generate
             # the patch.  So all the patch hunks need to be applied to a constant offset
             # within this file.  If the offset isn't tracked then the hunks can be
             # applied to the wrong lines of this file.
             python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A
             hg commit -Am adda
             # This is a cleaner patch generated via diff
             # In this case it reproduces the problem when
             # the output of hg export does not
             echo % import patch
             hg import -v -m 'b' -d '2 0' - <<EOF
             --- a/a	2009-12-08 19:26:17.000000000 -0800
             +++ b/a	2009-12-08 19:26:17.000000000 -0800
             @@ -9,7 +9,7 @@
              A
              A
              B
             -A
             +a
              A
              A
              A
             @@ -53,7 +53,7 @@
              A
              A
              B
             -A
             +a
              A
              A
              A
             @@ -75,7 +75,7 @@
              A
              A
              B
             -A
             +a
              A
              A
              A
             EOF
             echo % compare imported changes against reference file
             python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
-            diff -u aref a
+            diff aref a