You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Jean-Fran�ois Michaud <jf...@yahoo.ca> on 2007/05/03 22:43:50 UTC
bug report: bad incremention version of file (missing number)
dev@subversion.tigris.org
I was doing test to implement librari subversion and I canme across
that one.
The goal was in a revision, tobring back a previous file, and make a
revision out of it. (my client want that.)
Comment are in [ ]
ckf = CheKedout File
[ I populated the FSFS with just simple copy over and commit.
Also I did some lock to validate the lock action.
Such as: put a lock on a.txt in file version 3. --username=b
then unlock it with --username=jfmichaud
(I don't think that it is for a part in the reported bug. )
]
C:\Program Files\Subversion\bin>svn update c:\ckf\a.txt -r
U C:\CKF\a.txt
Updated to revision 1.
[so I retrived the desired file]
C:\Program Files\Subversion\bin>svn status c:\ckf -v -N
6 3 jfmichaud C:\CKF
6 3 jfmichaud C:\CKF\b.txt
6 3 jfmichaud C:\CKF\c.txt
6 3 jfmichaud C:\CKF\d.txt
6 1 jfmichaud C:\CKF\all_1
6 1 jfmichaud C:\CKF\all_2
1 1 jfmichaud C:\CKF\a.txt
[I then edited the file and saved it]
C:\Program Files\Subversion\bin>svn status c:\ckf -v -N
6 3 jfmichaud C:\CKF
6 3 jfmichaud C:\CKF\b.txt
6 3 jfmichaud C:\CKF\c.txt
6 3 jfmichaud C:\CKF\d.txt
6 1 jfmichaud C:\CKF\all_1
6 1 jfmichaud C:\CKF\all_2
M 1 1 jfmichaud C:\CKF\a.txt
[ ok: now on ...commiting]
C:\Program Files\Subversion\bin>svn commit c:\ckf
Sending CKF\a.txt
svn: Commit failed (details follow):
svn: Out of date: '/newProject/a.txt' in transaction '6-1'
svn: Your commit message was left in a temporary file:
svn: 'C:/CKF/svn-commit.tmp'
[good behavior], so I want to trick subversion to accept my "good"
file.
algo desired
1) copy my good file to somewhere. (not shown below]
2) bring back current file.
3) write over the current with my good file (-r1)
]
C:\Program Files\Subversion\bin>svn update c:\ckf
Restored 'C:\CKF\a.txt'
U C:\CKF\a.txt
Updated to revision 6.
[validation of status]
C:\Program Files\Subversion\bin>svn status c:\ckf -v
6 3 jfmichaud C:\CKF
6 3 jfmichaud C:\CKF\b.txt
6 3 jfmichaud C:\CKF\c.txt
6 3 jfmichaud C:\CKF\d.txt
6 1 jfmichaud C:\CKF\all_1
6 1 jfmichaud C:\CKF\all_1\b.txt
6 1 jfmichaud C:\CKF\all_1\c.txt
6 1 jfmichaud C:\CKF\all_1\d.txt
6 1 jfmichaud C:\CKF\all_1\a.txt
6 1 jfmichaud C:\CKF\all_2
6 1 jfmichaud C:\CKF\all_2\b.txt
6 1 jfmichaud C:\CKF\all_2\c.txt
6 1 jfmichaud C:\CKF\all_2\d.txt
6 1 jfmichaud C:\CKF\all_2\a.txt
6 3 jfmichaud C:\CKF\a.txt
[I copied my good file over the current]
C:\Program Files\Subversion\bin>svn status c:\ckf -v
6 3 jfmichaud C:\CKF
6 3 jfmichaud C:\CKF\b.txt
6 3 jfmichaud C:\CKF\c.txt
6 3 jfmichaud C:\CKF\d.txt
6 1 jfmichaud C:\CKF\all_1
6 1 jfmichaud C:\CKF\all_1\b.txt
6 1 jfmichaud C:\CKF\all_1\c.txt
6 1 jfmichaud C:\CKF\all_1\d.txt
6 1 jfmichaud C:\CKF\all_1\a.txt
6 1 jfmichaud C:\CKF\all_2
6 1 jfmichaud C:\CKF\all_2\b.txt
6 1 jfmichaud C:\CKF\all_2\c.txt
6 1 jfmichaud C:\CKF\all_2\d.txt
6 1 jfmichaud C:\CKF\all_2\a.txt
M 6 3 jfmichaud C:\CKF\a.txt
[ ok, I can commit]
C:\Program Files\Subversion\bin>svn commit c:\ckf
Sending CKF\a.txt
Transmitting file data .
Committed revision 7.
now, where are the revision...
C:\Program Files\Subversion\bin>svn status c:\ckf -v -N
6 3 jfmichaud C:\CKF
6 3 jfmichaud C:\CKF\b.txt
6 3 jfmichaud C:\CKF\c.txt
6 3 jfmichaud C:\CKF\d.txt
6 1 jfmichaud C:\CKF\all_1
6 1 jfmichaud C:\CKF\all_2
7 7 jfmichaud C:\CKF\a.txt
oups???
a.txt, is 7,7 should'nt it be: 7,4
version of a.txt will be.
1,2,3,7
I validate between -r6 and -r7
C:\Program Files\Subversion\bin>svn update c:\ckf\a.txt -r6
U C:\CKF\a.txt
Updated to revision 6.
C:\Program Files\Subversion\bin>svn status c:\ckf -v -N
... files
6 3 jfmichaud C:\CKF\a.txt
C:\Program Files\Subversion\bin>svn update c:\ckf\a.txt -r7
U C:\CKF\a.txt
Updated to revision 7.
C:\Program Files\Subversion\bin>svn status c:\ckf -v -N
... files
7 7 jfmichaud C:\CKF\a.txt
Bye
===============================================
Gravitation cannot be held responsible for people falling in Love.
Albert Einstein
Get a sneak peak at messages with a handy reading pane with All new Yahoo! Mail: http://mrd.mail.yahoo.com/try_beta?.intl=ca
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: bug report: bad incremention version of file (missing number)
Posted by Ben Collins-Sussman <su...@red-bean.com>.
On 5/3/07, Jean-François Michaud <jf...@yahoo.ca> wrote:
> a.txt, is 7,7 should'nt it be: 7,4
Why would it be 7,4? 7,7 is correct. The file is currently at r7,
and the file was last changed in r7.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org