Mailinglist Archive: opensuse-translation (72 mails)

< Previous Next >
Re: [opensuse-translation] SVN Branching, Online Update, and a small warning (suse-i18n)
  • From: "Carlos E. R." <robin.listas@xxxxxxxxxxxxxx>
  • Date: Wed, 7 Nov 2007 20:39:21 +0100 (CET)
  • Message-id: <alpine.LSU.0.9999.0711072017530.32002@xxxxxxxxxxxxxxxx>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


The Wednesday 2007-11-07 at 12:28 +0100, I wrote:


I think I goofed somewhat :-(


One of the files complained a lot:

update-desktop-files.es.po:29341: ...this is the location of the first
definition

It appears that they gave me the wrong file to send up to the server, and they asked me to revert the change.

cer@nimrodel:~/Projects/babel/SuSE> svn log
10_3/lcn/es/po/update-desktop-files.es.po | head
------------------------------------------------------------------------
r21967 | robin_listas | 2007-11-07 12:22:56 +0100 (Wed, 07 Nov 2007) | 1 line

Copied translated files from trunk, run update-po
------------------------------------------------------------------------
r21814 | keichwa | 2007-11-06 10:20:28 +0100 (Tue, 06 Nov 2007) | 1 line

from trunk 2007-10-29
------------------------------------------------------------------------
r19096 | keichwa | 2007-08-28 10:46:59 +0200 (Tue, 28 Aug 2007) | 1 line


The current version of 'update-desktop-files.es.po' is r21967, and we want r21814 back. So I consult the manual at <http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.branchmerge.commonuses.resurrect> and that I should do this:


$ svn copy -r 807 \
http://svn.example.com/repos/calc/trunk/real.c ./real.c

$ svn status
A + real.c

$ svn commit -m "Resurrected real.c from revision 807, /calc/trunk/real.c."
Adding real.c
Transmitting file data .
Committed revision 1390.


But it doesn't work for me:

cer@nimrodel:~/Projects/babel/SuSE> svn copy -r 21814
https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po
10_3/lcn/es/po/update-desktop-files.es.po
svn: Path '10_3/lcn/es/po/update-desktop-files.es.po' is not a directory

It says it has to be a directory? That's not what the docu above says. :-O


cer@nimrodel:~/Projects/babel/SuSE> svn copy -r 21814
https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po
10_3/lcn/es/po/
svn: Path '10_3/lcn/es/po/update-desktop-files.es.po' already exists

It exists! I know it exists, so overwrite it! I delete it by hand and retry:

cer@nimrodel:~/Projects/babel/SuSE> svn copy -r 21814
https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po
10_3/lcn/es/po/
svn: Entry for '10_3/lcn/es/po/update-desktop-files.es.po' exists (though
the working file is missing)


Argh. More RTFM for me.
[...]
Ok, so I remove it in the server:

cer@nimrodel:~/Projects/babel/SuSE> svn delete
./10_3/lcn/es/po/update-desktop-files.es.po
D 10_3/lcn/es/po/update-desktop-files.es.po
cer@nimrodel:~/Projects/babel/SuSE> svn copy -r 21814
https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po
./10_3/lcn/es/po/update-desktop-files.es.po
svn: Copyfrom-url
'https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po'
has different repository root than
'https://robin_listas@xxxxxxxxxxxxxxxxxxxx/svn/suse-i18n'

wtf? Any way, I got a local copy of the old file, but named as 'update-desktop-files.es.po.tmp'. I change the name back, and check:

cer@nimrodel:~/Projects/babel/SuSE> svn status ./10_3/lcn/es/po/
D 10_3/lcn/es/po/update-desktop-files.es.po

Huh? I think it is going to fail...

cer@nimrodel:~/Projects/babel/SuSE> svn commit --message "trying to resurrect
update-desktop-files.es.po@21814" ./10_3/lcn/es/po/
Deleting 10_3/lcn/es/po/update-desktop-files.es.po

Committed revision 21970.
cer@nimrodel:~/Projects/babel/SuSE> svn update ./10_3/lcn/es/po/
At revision 21970.

It did fail. :-(
Now there is no remote copy, and I can not copy it back:

cer@nimrodel:~/Projects/babel/SuSE> svn copy -r 21814
https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po
./10_3/lcn/es/po/
svn: Copyfrom-url
'https://forgesvn1.novell.com/svn/suse-i18n/branches/openSUSE-10_3-Branch/lcn/es/po/update-desktop-files.es.po'
has different repository root than
'https://robin_listas@xxxxxxxxxxxxxxxxxxxx/svn/suse-i18n'
cer@nimrodel:~/Projects/babel/SuSE> svn update ./10_3/lcn/es/po/
At revision 21970.

I keep getting a local 'update-desktop-files.es.po.tmp' which svn refuses to send to the server:

cer@nimrodel:~/Projects/babel/SuSE> svn commit --message "trying to resurrect
update-desktop-files.es.po@21814" ./10_3/lcn/es/po/
cer@nimrodel:~/Projects/babel/SuSE>
cer@nimrodel:~/Projects/babel/SuSE> svn status ./10_3/lcn/es/po/
? 10_3/lcn/es/po/update-desktop-files.es.po


Do I have to send it as a new file? :-?

cer@nimrodel:~/Projects/babel/SuSE> svn status ./10_3/lcn/es/po/
? 10_3/lcn/es/po/update-desktop-files.es.po
cer@nimrodel:~/Projects/babel/SuSE> svn add
./10_3/lcn/es/po/update-desktop-files.es.po
A 10_3/lcn/es/po/update-desktop-files.es.po
cer@nimrodel:~/Projects/babel/SuSE> svn status ./10_3/lcn/es/po/
A 10_3/lcn/es/po/update-desktop-files.es.po
cer@nimrodel:~/Projects/babel/SuSE> svn commit --message "trying to resurrect
update-desktop-files.es.po@21814" ./10_3/lcn/es/po/
Adding 10_3/lcn/es/po/update-desktop-files.es.po
Transmitting file data .
Committed revision 21971.
cer@nimrodel:~/Projects/babel/SuSE>


Well... the intended file is there, somehow, after all my goofing. Fantastic. :-(

Surely there is some better, proper way to revert a single file to an older version? The docu says how to revert a change by number, but it reverts all the files, and I want a single file reverted.


Sorry I'm giving you so much work... I'm new to svn, I'm afraid.


- -- Cheers,
Carlos E. R.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)
Comment: Made with pgp4pine 1.76

iD8DBQFHMhRttTMYHG2NR9URAlMkAJ9QktOPZ8/yGjuwc6oqLtLpvoG6PgCggu2C
DWD4vgRVmFwoLEhRcKxB3Bw=
=gQlB
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-translation+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-translation+help@xxxxxxxxxxxx

< Previous Next >
List Navigation
Follow Ups