[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: conflict applying patch in arch_build_revision
From: |
Masatake YAMATO |
Subject: |
Re: [Gnu-arch-users] Re: conflict applying patch in arch_build_revision |
Date: |
Wed, 10 Nov 2004 16:05:46 +0900 (JST) |
> * Manually edit the changesets and upload the modified version to your
> archive (VERY dangerous),
Maybe =tagging-method file is the reason of the fail of patching.
The method is explicit in base-0 and is tagline in patch-1.
...trying to repair by hands...
It works!
What I did is
1. runnning tla get (and it failed).
2. cd to the local-copy-directory.
3. running tla replay and finding the conflicts(I found it in base-0.)
4. cd to the base-0 of archive directories.
5 expanding tar.gz file(in my case gtracer--mainline--0.0--base-0.src.tar.gz)
6 fixing the conflicts
7 regenerating tar.gz file again.
7.1 removing ~ backup file generated by your emacs:)
7.2 taking care about dropping `src' in file name.
gtracer--mainline--0.0--base-0.src.tar.gz is expanded to
gtracer--mainline--0.0--base-0.
gtracer--mainline--0.0--base-0. should be archived to
gtracer--mainline--0.0--base-0.src.tar.gz.
8 recalculating checksum. Use md5sum.
Thank you for your suggestion.
However, I have already created a branch.
The original branch will be good place to test M-x tla-commit-with-sealing in
the future:)
Masatake YAMATO