git-move-refs.py: help the user move fixup tag commits which correspond to a partial tag

------=_Part_17942_1985376660.1312468707469
Content-Type: multipart/alternative; 
	boundary="----=_Part_17943_624617534.1312468707469"

------=_Part_17943_624617534.1312468707469
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi All,

As part of a large migration of an old repository. We seeing many cases
where a fix-up tag commits are generated corresponding to a partial tag
across the original CVS repository.  i.e. the tag contains only file/folder
deletions, and no file modifications or additions.

The reasons for the partial tags vary from: ,v files copied into the repo at
a later date, to the developer tagging part of the repo. at release rather
than the full module root.

It's debatable whether the conversion should remain true to the original
repo. and have hundreds of fix-up tag commits, or whether the tag should be
enlarged to span the complete repo.  In our case, where our repo. is mostly
C, where possible (and safe) it seems cleanest that these tags span the
complete repo.

Attached is a patch to git-move-refs.py to make it easy for the user to make
this choice. Something like:

# Move tags with no changes to parent
python ~/work/workspaces/tools/cvs2svn/contrib/git-move-refs.py

# Move tags which represent only file deletions in the repo
python ~/work/workspaces/tools/cvs2svn/contrib/git-move-refs.py |sort|uniq >
../move_delete_only_tags_to_parent.sh
less ../move_delete_only_tags_to_parent.sh
chmod +x ../move_delete_only_tags_to_parent.sh
../move_delete_only_tags_to_parent.sh

Cheers,
James

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2809094

To unsubscribe from this discussion, e-mail: [[email protected]].
------=_Part_17943_624617534.1312468707469
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Hi All,<div><br></div><div>As part of a large migration of an old repositor=
y. We seeing many cases where a fix-up tag commits are generated correspond=
ing to a partial tag across the original CVS repository. =A0i.e. the tag co=
ntains only file/folder deletions, and no file modifications or additions.<=
/div>
<div><br></div><div>The reasons for the partial tags vary from: ,v files co=
pied into the repo at a later date, to the developer tagging part of the re=
po. at release rather than the full module root.</div><div><br></div><div>
It&#39;s debatable whether the conversion should remain true to the origina=
l repo. and have hundreds of fix-up tag commits, or whether the tag should =
be enlarged to span the complete repo. =A0In our case, where our repo. is m=
ostly C, where possible (and safe) it seems cleanest that these tags span t=
he complete repo.</div>
<div><br></div><div>Attached is a patch to git-move-refs.py to make it easy=
 for the user to make this choice. Something like:</div><div><br></div><div=
><div># Move tags with no changes to parent</div><div>python ~/work/workspa=
ces/tools/cvs2svn/contrib/git-move-refs.py</div>
<div><br></div><div># Move tags which represent only file deletions in the =
repo</div><div>python ~/work/workspaces/tools/cvs2svn/contrib/git-move-refs=
.py |sort|uniq &gt; ../move_delete_only_tags_to_parent.sh</div><div>less ..=
/move_delete_only_tags_to_parent.sh</div>
<div>chmod +x ../move_delete_only_tags_to_parent.sh</div><div>../move_delet=
e_only_tags_to_parent.sh</div></div><div><br></div><div>Cheers,</div><div>J=
ames</div><div><br></div><div><br></div><div><br></div>

------=_Part_17943_624617534.1312468707469--

------=_Part_17942_1985376660.1312468707469
Content-Type: application/octet-stream; name=git-move-refs.patch
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gqxu1ohm1
Content-Disposition: attachment; filename=git-move-refs.patch

IyMjIEVjbGlwc2UgV29ya3NwYWNlIFBhdGNoIDEuMAojUCBjdnMyc3ZuCkluZGV4OiBjb250cmli
L2dpdC1tb3ZlLXJlZnMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gY29udHJpYi9naXQtbW92ZS1yZWZzLnB5
CShyZXZpc2lvbiA1MzQ0KQorKysgY29udHJpYi9naXQtbW92ZS1yZWZzLnB5CSh3b3JraW5nIGNv
cHkpCkBAIC0xMCw2ICsxMCwxNCBAQAogRnVydGhlcm1vcmUsIGlmIG9uZSBvZiB0aGUgcGFyZW50
cyBvZiB0aGUgZml4dXAgY29tbWl0IGlzIGlkZW50aWNhbCB0bwogdGhlIGZpeHVwIGNvbW1pdCBp
dHNlbGYsIHRoZW4gdGhlIGhlYWQgb3IgdGFnIGlzIG1vdmVkIHRvIHRoZSBwYXJlbnQuCiAKK1Ro
aXMgc2NyaXB0IHdpbGwgYWxzbyBwcmludCBjb21tYW5kcyB0byBtb3ZlIGEgdGFnLCB3aGljaCBw
b2ludHMgYXQgYSBmaXh1cCBjb21taXQsCit0byB0aGUgZml4dXAncyBwYXJlbnQgd2hlbiB0aGUg
Zml4dXAgY29udGFpbnMgb25seSBmaWxlIGRlbGV0aW9ucy4KK0luIHRoaXMgY2FzZSB0aGUgZml4
dXAgcmVwcmVzZW50cyBhIHBhcnRpYWwgYnJhbmNoIC8gdGFnIHRha2VuIGFjcm9zcyB0aGUgCitD
VlMgcmVwb3NpdG9yeS4gRXhlY3V0aW5nIHRoZSBwcmludGVkIGNvbW1hbmQgbW92ZXMgdGhlIHRh
ZyBzbyB0aGF0IGl0IHNwYW5zIHRoZSBmdWxsIGdpdCByZXBvCisocG90ZW50aWFsbHkgcmVtb3Zp
bmcgdGhlIGZpeHVwIGNvbW1pdCBpbiB0aGUgcHJvY2VzcykuCitXaGlsZSB0aGUgY2hlY2tvdXQg
ZnJvbSBnaXQgd2lsbCB0aGVuIGNvbnRhaW4gYWRkaXRpb25hbCBmaWxlcywgaW4gbWFueSBpbnN0
YW5jZXMKK3RoaXMgaXMgZGVzaXJhYmxlLgorCiBUaGUgc2NyaXB0IGlzIG1lYW50IHRvIGJlIHJ1
biBhZ2FpbnN0IGEgcmVwb3NpdG9yeSBjb252ZXJ0ZWQgYnkKIGN2czJzdm4sIHNpbmNlIGN2czJz
dm4gY3JlYXRlcyBlbXB0eSBjb21taXRzIGZvciBzb21lIHRhZ3MgYW5kIGhlYWQKIHJlZnMgKGJy
YW5jaGVzKS4KQEAgLTU1LDYgKzYzLDIwIEBACiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBw
cmludCAiRkFJTEVEIgogCitkZWYgaXNfcHVyZV9kZWxldGVfY29tbWl0KGNvbW1pdCk6CisgICAg
Z2V0X3RyZWVfY21kID0gWyJnaXQiLCAibG9nIiwgIi0tcHJldHR5PW9uZWxpbmUiLCAiLS1uYW1l
LXN0YXR1cyIsIGNvbW1pdCArICJeLi4iICsgY29tbWl0XQorICAgIHAgPSBQb3BlbihnZXRfdHJl
ZV9jbWQsIHN0ZG91dCA9IFBJUEUpCisgICAgbGluZSA9IHAuc3Rkb3V0LnJlYWRsaW5lKCkuc3Ry
aXAoKQorICAgIGFzc2VydCBsaW5lLnNwbGl0KClbMF0gPT0gY29tbWl0CisgICAgd2hpbGUgVHJ1
ZToKKyAgICAgICAgbGluZSA9IHAuc3Rkb3V0LnJlYWRsaW5lKCkuc3RyaXAoKQorICAgICAgICBp
ZiBub3QgbGluZToKKyAgICAgICAgICAgIGJyZWFrCisgICAgICAgIGlmIGxpbmUuc3BsaXQoKVsw
XSAhPSAnRCc6CisgICAgICAgICAgICBhc3NlcnQgbGluZS5zcGxpdCgpWzBdID09ICdBJyBvciBs
aW5lLnNwbGl0KClbMF0gPT0gJ00nCisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICByZXR1
cm4gVHJ1ZQorCiAKIGRlZiB0cnlfdG9fbW92ZV9yZWYocmVmLCBjb21taXQsIHRyZWUsIHBhcmVu
dHMsIHJlZl90eXBlKToKICAgICAiIiJUcnkgdG8gbW92ZSB0aGUgZ2l2ZW4gcmVmIHRvIGEgc2Vw
YXJhdGUgY29tbWl0ICh3aXRoIGlkZW50aWNhbCB0cmVlKS4iIiIKQEAgLTc1LDYgKzk3LDEyIEBA
CiAgICAgICAgICAgICBtb3ZlX3JlZihyZWYsIGNvbW1pdCwgcCwgcmVmX3R5cGUpCiAgICAgICAg
ICAgICBjb21taXQgPSBwCiAgICAgICAgICAgICBicmVhaworICAgICAgICBlbGlmIGxlbihwYXJl
bnRzKSA9PSAxOgorICAgICAgICAgICAgIyBJZiB0aGlzIHRhZyAvIGJyYW5jaCBpcyBhIHB1cmUg
ZGVsZXRpb24sIHRoZW4gbWF5IGFsc28gbW92ZSB0byBwYXJlbnQKKyAgICAgICAgICAgIGlmIGlz
X3B1cmVfZGVsZXRlX2NvbW1pdChjb21taXQpOgorICAgICAgICAgICAgICAgIHByaW50ICIjICIg
KyAoIlRhZyIgaWYgInRhZ3MiIGVsc2UgIkJyYW5jaCIpICsgIiBwb2ludHMgYXQgYSBmaXh1cCBj
b21taXQgc3Bhbm5pbmcgYSBzdWJzZXQgb2YgdGhlIHJlcG9zaXRvcnkuIENvbnNpZGVyIHRhZ2dp
bmcgdGhlIHdob2xlIHJlcG8gYnkgcnVubmluZzoiCisgICAgICAgICAgICAgICAgcHJpbnQgImdp
dCAiICsgKCJ0YWciIGlmICJ0YWdzIiBlbHNlICJicmFuY2giKSArICIgLWYgIiArIHJlZiArICIg
IiArIHAKKyAgICAgICAgICAgIAogCiAgICAgIyBSZWdpc3RlciB0aGUgcmVzdWx0aW5nIGNvbW1p
dCBvYmplY3QgaW4gdGhlIHRyZWVfY2FjaGUKICAgICBhc3NlcnQgdHJlZSBub3QgaW4gdHJlZV9j
YWNoZSAjIFNhbml0eSBjaGVjawo=
------=_Part_17942_1985376660.1312468707469--