[subgit-users-2015] SVN Commit broke subgit mappings

14 views
Skip to first unread message

Michael Schaefer

unread,
Jun 3, 2016, 3:24:46 PM6/3/16
to subgit...@googlegroups.com
Hi,

I am facing a very unfortuate problem. A co-worker has commited a different=
path for branch archiving and the result is that I now get "Could not upda=
te 'refs/heads/archive' to 424331ecade45f68803887cc9a36529ab518013c" when t=
rying to fetch.

Our mappings are:

branches =3D branches/*:refs/heads/*
branches =3D branch_archive/*:refs/heads/archive/*

Unfortunately the co-worker who just uses svn created a new archive directo=
ry "branches/archive" and moved a branch there.

I can solve the problem by adding:

branches =3D branches/archive/*:refs/heads/archive/*

But this forces me to install --rebuild, which creates different hashes (is=
it supposed to?) and then my local working copy with a bunch of work on va=
rious branches diverges and I run into a whole load of mess and extra work.

Is there a way to add that branch mapping without getting new hashes and ke=
ep the existing working copy?

--=20
Michael Schaefer

--- INIT GmbH
| I N | Am Oelper Berge 9
| I T | 38114 Braunschweig
--- Tel. (049) 531 580800
=20
-----------------------------------------------------------------------
The road to hell is paved with good intentions.=

Reply all
Reply to author
Forward
0 new messages