You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jochen Wuttke <wu...@lu.unisi.ch> on 2008/07/07 18:05:22 UTC
dump | dumpfilter | load problem
Hi,
I have a problem moving data from one repository to another using a
'dump | dumpfilter | load' cycle.
I did a
svnadmin dump /my/repos > dumpfile
svndumpfilter include a/path --drop-empty-revs --renumber-revs <
dumpfile >filtered
and until here it seems to work, the filtered file contains what I
want (I think) and the commands did not return any error message.
Now when I try to do
svnadmin load --parent-dir new/parent /new/repos < filtered
I get the error message:
$ svnadmin load --parent-dir LuMiNous /home/pezze/Shared/code
<lumi.filter.repo
<<< Started new transaction, based on original revision 1
svnadmin: File not found: transaction '34-1', path 'LuMiNous/tests/
trunk/ch.unisi.lumi.mdd.tests'
* adding path : LuMiNous/tests/trunk/ch.unisi.lumi.mdd.tests ...
The command terminates and I have a stale transaction in the new
repository. The new repository already contains data, just in case
that makes a difference.
The problem occurs with a 1.4.6 installation on a Debian linux box.
Thanks
Jochen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
diff parameters in config file
Posted by Michael Maxwell <mm...@casl.umd.edu>.
I want to make svn diff use the traditional '<' and '>' in place of '-' and '+' for labeling the lines from the repository version and my working version.
One way to do this is of course to specify it on the command line:
svn diff --diff-cmd /usr/bin/diff -x '-h' foobar
But since I always want to do this, I would rather not specify it on every command line.
I set up an alias in my .bashrc file
alias svndiff = svn diff --diff-cmd /usr/bin/diff -x '-h'
then later ran across the ~/.sconfig/config file. Only I can't seem to make it work there!
Specifically, if I do
diff-cmd = /usr/bin/diff -h
in that config file, I get an error msg:
exec of '/usr/bin/diff -h' failed: No such file or directorysvn: '/usr/bin/diff -h' returned 255
because svn is attempting to interpret the entire "/usr/bin/diff -h" line (space chars included, shades of Windows) as a path, as described in the config file:
### Set diff-cmd to the absolute path of your 'diff' program.
(BTW, '-h' is supposed to be a no-op in the version of 'diff' I'm using, but for svn it results in '<' and '>' being output in place of '-' and '+'; without passing *some* parameter to the diff command, this does not work. This also seems to determine whether I get context lines or not. My guess is that if I supply at least one parameter, svn diff doesn't supply any of its own; otherwise it supplies its own. Go figure...)
Oddly, the analogous command works fine for setting the editor:
editor-cmd = /usr/bin/vim -c ":start"
as also described in the config file:
### Set editor to the command used to invoke your text editor.
So 'diff-cmd' is a *path*, and 'editor-cmd' is a *command*.
So, a couple-three questions:
1) Is there a better way to do what I'm trying to do, namely use '<' and '>' in place of '-' and '+'?
2) Is there a way in the config file to pass a parameter to the diff command?
3) Why are the editor and the diff command treated differently in the config file?
This is under svn 1.4.2, RedHat Linux.
Mike Maxwell
CASL/ U Md
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: dump | dumpfilter | load problem
Posted by Jochen Wuttke <wu...@lu.unisi.ch>.
Thanks for the tip!
The problem was that in the filtered dump, the first action was to
create the directory shown in the error message. Apparently subversion
does not create top-level directories if they are missing (maybe this
should be documented or be allowed to force through an option?). After
adding those manually, the load just worked fine.
Jochen
On Jul 7, 2008, at 8:39 PM, Karl Heinz Marbaise wrote:
> Hi,
>
>> svnadmin load --parent-dir new/parent /new/repos < filtered
>>
>> I get the error message:
>>
>> $ svnadmin load --parent-dir LuMiNous /home/pezze/Shared/code
>> <lumi.filter.repo
>> <<< Started new transaction, based on original revision 1
>> svnadmin: File not found: transaction '34-1', path
>> 'LuMiNous/tests/trunk/ch.unisi.lumi.mdd.tests'
>> * adding path : LuMiNous/tests/trunk/ch.unisi.lumi.mdd.tests ...
> It seemed to me that you have filtered revisions from which this file
> has been copied to....in a earlier revision....have you take a look on
> that file and revision and checked if it might be created by an copy
> operation ...?
>
> Kind regards
> Karl Heinz Marbaise
> --
> SoftwareEntwicklung Beratung Schulung Tel.: +49 (0) 2405 / 415 893
> Dipl.Ing.(FH) Karl Heinz Marbaise ICQ#: 135949029
> Hauptstrasse 177 USt.IdNr: DE191347579
> 52146 Würselen http://www.soebes.de
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: dump | dumpfilter | load problem
Posted by Karl Heinz Marbaise <kh...@gmx.de>.
Hi,
> svnadmin load --parent-dir new/parent /new/repos < filtered
>
> I get the error message:
>
> $ svnadmin load --parent-dir LuMiNous /home/pezze/Shared/code
> <lumi.filter.repo
> <<< Started new transaction, based on original revision 1
> svnadmin: File not found: transaction '34-1', path
> 'LuMiNous/tests/trunk/ch.unisi.lumi.mdd.tests'
> * adding path : LuMiNous/tests/trunk/ch.unisi.lumi.mdd.tests ...
It seemed to me that you have filtered revisions from which this file
has been copied to....in a earlier revision....have you take a look on
that file and revision and checked if it might be created by an copy
operation ...?
Kind regards
Karl Heinz Marbaise
--
SoftwareEntwicklung Beratung Schulung Tel.: +49 (0) 2405 / 415 893
Dipl.Ing.(FH) Karl Heinz Marbaise ICQ#: 135949029
Hauptstrasse 177 USt.IdNr: DE191347579
52146 Würselen http://www.soebes.de
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org