On Mon, 21 Dec 2015, Guillaume Hoffmann wrote:
Indeed, "darcs convert" is sensitive to patch ordering, which is a
problem in your case.
But isn't it a bug that some tags seem to be lost after the conversion?
(As I have demonstrated below: the tags are present in the source darcs-1
repo, but not in the result.)
I know it's not really solving the problem but have you noticed that
the user "visq" on hub.darcs.net is actually the maintainer of
language-c ? (As I can see from the repo history
http://code.haskell.org/language-c/_darcs/inventory ). I guess you
can make patches against the hub.darcs.net repo then.
Ok, thanks, I'll work it out somehow. I simply have already recorded some
patches and have wondered about a simple way to transfer them to the
darcs-2 repo (a clone of the URL above).
2015-12-21 7:26 GMT-03:00 Ivan Zakharyaschev <i...@altlinux.org>:
On Mon, 21 Dec 2015, Ivan Zakharyaschev wrote:
It looks like a bug in the darcs conversion in my case, because my darcs-2
result of the conversion lacks some tags, which are present in the darcs-1
source (and also in the hub darcs-2 repo). It's strange that the conversion
once done for hub didn't have this problem.
~/TOOLS/prog/language-c.darcs-2 $ darcs show tags
imz_init_typos-fixed
0.4.1
0.3.1
$ cd ../language-c
~/TOOLS/prog/language-c $ darcs show tags
imz_init_typos-fixed
0.4.1
darcs_apply_bug
0.3.1
0.3
0.1
~/TOOLS/prog/language-c_hub $ darcs show tags
0.4.1
darcs_apply_bug
0.3.1
0.3
0.1
The conversion was done like this (with some warnings/error messages):
~/TOOLS/prog $ darcs convert darcs-2 language-c language-c.darcs-2
WARNING: the repository produced by this command is not understood by
Darcs 1.x, and patches cannot be exchanged between repositories in
darcs-1 and darcs-2 formats.
Furthermore, repositories created by different invocations of
this command SHOULD NOT exchange patches.
Please confirm that you have read and understood the above
by typing `I understand the consequences of my action': I understand the
consequences of my action
lossy conversion:
merger 0.0 (
merger 0.0 (
hunk ./src/Language/C/Data/Position.hs 115
+-- | advance to the next row
+incRow :: Position -> Position
+incRow (Position o f r c) = Position o f (r + 1) c
+incRow p = p
hunk ./src/Language/C/Data/Position.hs 115
+{-# INLINE adjustPos #-}
+-- | adjust position: change file and line number, reseting column to 1.
This is usually
+-- used for #LINE pragmas. The absolute offset is not changed - this
can be done
+-- by @adjustPos newFile line . incPos (length pragma)@.
+adjustPos :: FilePath -> Int -> Position -> Position
+adjustPos fname row (Position offs _ _ _) = Position offs fname row 1
+adjustPos _ _ p = p
)
hunk ./src/Language/C/Data/Position.hs 115
--- | advance to the next row
+-- | advance to the next row, this does not reset the column. use
+-- @retPos@ if that's what you want to do.
)
Finished converting.
$ darcs --exact-version
darcs compiled on May 26 2015, at 04:18:50
Context:
[TAG 2.10.0
Guillaume Hoffmann <guilla...@gmail.com>**20150419200705
Ignore-this: 6d154c9aa51c8328c777ca9a2c223125
]
Compiled with:
HTTP-4000.2.19
array-0.4.0.1
attoparsec-0.12.1.3
base-4.6.0.0
base16-bytestring-0.1.1.6
binary-0.7.3.0
bytestring-0.10.0.0
containers-0.5.0.0
cryptohash-0.11.6
data-ordlist-0.4.7.0
dataenc-0.14.0.4
directory-1.2.0.0
filepath-1.3.0.1
hashable-1.2.3.1
haskeline-0.7.2.1
html-1.0.1.2
mmap-0.5.8
mtl-2.2.1
network-2.4.2.3
old-locale-1.0.0.5
old-time-1.1.0.1
parsec-3.1.8
process-1.1.0.2
random-1.1
regex-applicative-0.3.1
regex-compat-tdfa-0.95.1.4
tar-0.4.0.1
terminfo-0.3.2.5
text-1.2.0.4
time-1.4.0.1
transformers-0.4.2.0
transformers-compat-0.4.0.4
unix-2.6.0.0
unix-compat-0.4.1.4
utf8-string-0.3.7
vector-0.10.0.1
zip-archive-0.2.3.7
zlib-0.5.4.0
Best regards,
Ivan
_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users
_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users
