From: "psantosl@codicesoftware.com" <psantosl@codicesoftware.com>
To: git@vger.kernel.org
Cc: Shawn Pearce <spearce@spearce.org>
Subject: Re: git fast-import --export-marks flag
Date: Mon, 28 Mar 2011 22:47:52 +0200 [thread overview]
Message-ID: <4D90F3F8.1020706@codicesoftware.com> (raw)
In-Reply-To: <4D90BBC4.2000908@codicesoftware.com>
It's working on 1.7, was broken on 1.6
Thanks,
pablo
On 28/03/2011 18:48, psantosl@codicesoftware.com wrote:
> Hi Shawn,
>
>> I don't know what you are looking at, but fast-import uses the same
>> mark numbers that were supplied in the input stream inside of the
>> exported marks file. Otherwise as you pointed out, the marks are
>> useless.
>
> Well, they're useful to run subsequent imports reusing the marks
> generated on the first import.
>
> But ok, it seems my marks are "overflowing":
>
>> cat fast-export.dat
> blob
> mark :1
> data 7
> bar.c
>
> blob
> mark :2
> data 7
> foo.c
>
> reset refs/heads/master
> commit refs/heads/master
> mark :1583217
> author unknown <pablo@.(none)> 1300813103 +0100
> committer unknown <pablo@.(none)> 1300813103 +0100
> data 8
> initial
> M 100644 :1 src/bar.c
> M 100644 :2 src/foo.c
>
> commit refs/heads/master
> mark :1583219
> author unknown <pablo@.(none)> 1300813115 +0100
> committer unknown <pablo@.(none)> 1300813115 +0100
> data 5
> move
> from :1583217
> R "src/bar.c" "dst/bar.c"
> R "src/foo.c" "dst/foo.c"
>
> reset refs/heads/master
> from :1583219
>
> And the generated marks are:
>
> :1 d1fe62248992d88f286d03bde972932e0118bf3c
> :2 146a766f34eb1dfb6c4d7b19a45ddf49ef7e5d5b
> :1074276465 52f475aba140ca2d6f6eb8f47ef0cdb9d043fab5
> :1074276467 caf606bb7cc64bab818acbc52b40d545467ddafc
>
>
> pablo
prev parent reply other threads:[~2011-03-28 20:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 16:16 git fast-import --export-marks flag psantosl
2011-03-28 16:25 ` Shawn Pearce
2011-03-28 16:48 ` psantosl
2011-03-28 20:47 ` psantosl [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D90F3F8.1020706@codicesoftware.com \
--to=psantosl@codicesoftware.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.