Artifact
1a4feda3179b286e701a26eed389759df902536c:
Ticket change
[1a4feda317]
- Ticket
[fbfe43e153] shash pop will drop the stash even if it could not apply it. status still Open with 1 other change
by
BM
2011-01-24 16:52:26.
0000: 44 20 32 30 31 31 2d 30 31 2d 32 34 54 31 36 3a D 2011-01-24T16:
0010: 35 32 3a 32 36 2e 38 37 35 0a 4a 20 63 6f 6d 6d 52:26.875.J comm
0020: 65 6e 74 20 48 65 6c 6c 6f 2c 5c 72 5c 6e 5c 72 ent Hello,\r\n\r
0030: 5c 6e 53 61 79 5c 73 74 68 61 74 5c 73 6d 79 5c \nSay\sthat\smy\
0040: 73 3c 74 74 3e 5f 46 4f 53 53 49 4c 5f 3c 2f 74 s<tt>_FOSSIL_</t
0050: 74 3e 5c 73 66 69 6c 65 5c 73 69 73 5c 73 69 6e t>\sfile\sis\sin
0060: 5c 73 3c 74 74 3e 2f 68 6f 6d 65 2f 70 72 6f 6a \s<tt>/home/proj
0070: 65 63 74 31 3c 2f 74 74 3e 5c 72 5c 6e 5c 72 5c ect1</tt>\r\n\r\
0080: 6e 49 5c 73 61 6d 5c 73 69 6e 5c 73 3c 74 74 3e nI\sam\sin\s<tt>
0090: 2f 68 6f 6d 65 2f 70 72 6f 6a 65 63 74 31 2f 66 /home/project1/f
00a0: 6f 6f 3c 2f 74 74 3e 5c 72 5c 6e 5c 72 5c 6e 3c oo</tt>\r\n\r\n<
00b0: 74 74 3e 66 6f 73 73 69 6c 5c 73 63 68 61 6e 67 tt>fossil\schang
00c0: 65 73 3c 2f 74 74 3e 5c 73 74 65 6c 6c 73 5c 73 es</tt>\stells\s
00d0: 6d 65 5c 73 74 68 61 74 5c 73 3c 74 74 3e 66 6f me\sthat\s<tt>fo
00e0: 6f 2f 62 61 72 2f 62 61 7a 2e 74 78 74 3c 2f 74 o/bar/baz.txt</t
00f0: 74 3e 5c 73 61 6e 64 5c 73 3c 74 74 3e 62 61 72 t>\sand\s<tt>bar
0100: 2f 66 6f 6f 2f 62 61 7a 2e 74 78 74 3c 2f 74 74 /foo/baz.txt</tt
0110: 3e 5c 73 68 61 76 65 5c 73 62 6f 74 68 5c 73 63 >\shave\sboth\sc
0120: 68 61 6e 67 65 64 2e 5c 73 57 68 61 74 5c 73 69 hanged.\sWhat\si
0130: 74 5c 73 6c 69 73 74 73 5c 73 61 72 65 5c 73 70 t\slists\sare\sp
0140: 61 74 68 73 5c 73 72 65 6c 61 74 69 76 65 5c 73 aths\srelative\s
0150: 74 6f 5c 73 74 68 65 5c 73 64 69 72 65 63 74 6f to\sthe\sdirecto
0160: 72 79 5c 73 77 68 65 72 65 5c 73 3c 74 74 3e 5f ry\swhere\s<tt>_
0170: 46 4f 53 53 49 4c 5f 3c 2f 74 74 3e 5c 73 69 73 FOSSIL_</tt>\sis
0180: 2e 5c 73 54 68 6f 73 65 5c 73 70 61 74 68 73 5c .\sThose\spaths\
0190: 73 61 72 65 5c 73 6e 6f 74 5c 73 72 65 6c 61 74 sare\snot\srelat
01a0: 69 76 65 5c 73 74 6f 5c 73 6d 79 5c 73 43 57 44 ive\sto\smy\sCWD
01b0: 2e 5c 72 5c 6e 5c 72 5c 6e 3c 74 74 3e 66 6f 73 .\r\n\r\n<tt>fos
01c0: 73 69 6c 5c 73 73 74 61 73 68 5c 73 73 61 76 65 sil\sstash\ssave
01d0: 5c 73 2d 6d 5c 73 68 65 6c 6c 6f 5c 73 66 6f 6f \s-m\shello\sfoo
01e0: 2f 62 61 72 2f 62 61 7a 2e 74 78 74 3c 2f 74 74 /bar/baz.txt</tt
01f0: 3e 5c 73 3c 62 3e 73 68 6f 75 6c 64 5c 73 66 61 >\s<b>should\sfa
0200: 69 6c 3c 2f 62 3e 5c 73 62 65 63 61 75 73 65 5c il</b>\sbecause\
0210: 73 69 74 5c 73 65 78 70 65 63 74 73 5c 73 61 5c sit\sexpects\sa\
0220: 73 70 61 74 68 5c 73 72 65 6c 61 74 69 76 65 5c spath\srelative\
0230: 73 74 6f 5c 73 74 68 65 5c 73 43 57 44 2c 5c 73 sto\sthe\sCWD,\s
0240: 62 75 74 5c 73 69 74 5c 73 77 69 6c 6c 5c 73 72 but\sit\swill\sr
0250: 65 76 65 72 74 5c 73 62 6f 74 68 5c 73 66 69 6c evert\sboth\sfil
0260: 65 73 5c 73 61 6e 64 5c 73 6d 61 6b 65 5c 73 61 es\sand\smake\sa
0270: 5c 73 73 74 61 73 68 5c 73 66 72 6f 6d 5c 73 74 \sstash\sfrom\st
0280: 68 65 6d 2e 5c 72 5c 6e 5c 72 5c 6e 54 68 65 6e hem.\r\n\r\nThen
0290: 2c 5c 73 3c 74 74 3e 66 6f 73 73 69 6c 5c 73 73 ,\s<tt>fossil\ss
02a0: 74 61 73 68 5c 73 70 6f 70 3c 2f 74 74 3e 2c 5c tash\spop</tt>,\
02b0: 73 77 68 69 63 68 5c 73 73 65 65 6d 73 5c 73 74 swhich\sseems\st
02c0: 6f 5c 73 65 78 70 65 63 74 5c 73 6d 65 5c 73 74 o\sexpect\sme\st
02d0: 6f 5c 73 62 65 5c 73 61 74 5c 73 74 68 65 5c 73 o\sbe\sat\sthe\s
02e0: 72 6f 6f 74 5c 73 6f 66 5c 73 74 68 65 5c 73 77 root\sof\sthe\sw
02f0: 6f 72 6b 69 6e 67 5c 73 74 72 65 65 2c 5c 73 77 orking\stree,\sw
0300: 69 6c 6c 5c 73 74 72 79 5c 73 74 6f 5c 73 61 70 ill\stry\sto\sap
0310: 70 6c 79 5c 73 74 68 65 5c 73 73 74 61 73 68 2c ply\sthe\sstash,
0320: 5c 73 66 61 69 6c 5c 73 74 6f 5c 73 64 6f 5c 73 \sfail\sto\sdo\s
0330: 69 74 2c 5c 73 62 75 74 5c 73 73 74 69 6c 6c 5c it,\sbut\sstill\
0340: 73 64 72 6f 70 5c 73 69 74 2c 5c 73 3c 62 3e 70 sdrop\sit,\s<b>p
0350: 6f 74 65 6e 74 69 61 6c 6c 79 5c 73 6c 6f 73 69 otentially\slosi
0360: 6e 67 5c 73 77 6f 72 6b 3c 2f 62 3e 2e 5c 73 49 ng\swork</b>.\sI
0370: 74 5c 73 73 68 6f 75 6c 64 5c 73 68 61 76 65 5c t\sshould\shave\
0380: 73 6b 65 70 74 5c 73 74 68 65 5c 73 73 74 61 73 skept\sthe\sstas
0390: 68 5c 73 62 65 63 61 75 73 65 5c 73 69 74 5c 73 h\sbecause\sit\s
03a0: 63 6f 75 6c 64 5c 73 6e 6f 74 5c 73 61 70 70 6c could\snot\sappl
03b0: 79 5c 73 69 74 2e 5c 72 5c 6e 5c 72 5c 6e 49 5c y\sit.\r\n\r\nI\
03c0: 73 77 61 73 5c 73 6c 75 63 6b 79 5c 73 74 6f 5c swas\slucky\sto\
03d0: 73 68 61 76 65 5c 73 61 5c 73 72 65 63 65 6e 74 shave\sa\srecent
03e0: 5c 73 64 69 66 66 5c 73 67 65 6e 65 72 61 74 65 \sdiff\sgenerate
03f0: 64 5c 73 62 79 5c 73 66 6f 73 73 69 6c 5c 73 77 d\sby\sfossil\sw
0400: 69 74 68 5c 73 77 68 69 63 68 5c 73 49 5c 73 77 ith\swhich\sI\sw
0410: 61 73 5c 73 61 62 6c 65 5c 73 74 6f 5c 73 72 65 as\sable\sto\sre
0420: 63 6f 76 65 72 5c 73 6d 79 5c 73 77 6f 72 6b 5c cover\smy\swork\
0430: 73 28 74 77 6f 5c 73 64 61 79 73 29 2e 0a 4b 20 s(two\sdays)..K
0440: 66 62 66 65 34 33 65 31 35 33 65 65 30 65 31 64 fbfe43e153ee0e1d
0450: 65 39 64 66 34 64 30 65 35 31 64 63 31 64 30 65 e9df4d0e51dc1d0e
0460: 32 66 63 65 38 35 65 30 0a 55 20 42 4d 0a 5a 20 2fce85e0.U BM.Z
0470: 62 33 62 61 32 36 32 32 32 66 63 63 63 66 66 65 b3ba26222fcccffe
0480: 31 38 39 39 64 64 39 64 64 34 66 36 61 64 62 37 1899dd9dd4f6adb7
0490: 0a .