diff options
author | Luke Diamand <luke@diamand.org> | 2012-04-11 17:21:24 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-11 11:04:53 -0700 |
commit | 06804c76e8f7a61c7c9473decdf9b210d3238e9d (patch) | |
tree | 29aac73bce738cbd42fda4ae8c36b9894d1d86c4 /Documentation/git-merge-index.txt | |
parent | git p4: Fixing script editor checks (diff) | |
download | tgif-06804c76e8f7a61c7c9473decdf9b210d3238e9d.tar.xz |
git p4: import/export of labels to/from p4
The existing label import code looks at each commit being
imported, and then checks for labels at that commit. This
doesn't work in the real world though because it will drop
labels applied on changelists that have already been imported,
a common pattern.
This change adds a new --import-labels option. With this option,
at the end of the sync, git p4 gets sets of labels in p4 and git,
and then creates a git tag for each missing p4 label.
This means that tags created on older changelists are
still imported.
Tags that could not be imported are added to an ignore
list.
The same sets of git and p4 tags and labels can also be used to
derive a list of git tags to export to p4. This is enabled with
--export-labels in 'git p4 submit'.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions