You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by David Carson <dc...@yahoo.com> on 2009/09/03 03:48:46 UTC
unmodified files are being committed
We are occasionally seeing a commit which includes the modified files and one or more unmodified file(s). How is this possible?
$ svnlook changed -r 496 /export/svn/merlin
U top/branches/v12/code/type.c
U top/branches/v12/tools/crashfmt
$ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
Modified: top/branches/v12/code/type.c
As you can see, the commit seems to contain textual changes to two files ('U' is in column 1). However, when I diff the files, only one of them has truly changed. I have tried to see the diff to crashfmt in other ways as well, using command line client, viewVc, etc. All agree that (a) it was part of the commit and (b) it was not changed.
What is going on?
Thanks,
David
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390510
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Re: unmodified files are being committed
Posted by David Carson <dc...@yahoo.com>.
> On Sep 3, 2009, at 8:49 AM, David Carson wrote:
>
> >> David Carson wrote on Wed, 2 Sep 2009 at 21:24 -0700:
> >>>> On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dc...@yahoo.com>
> >>>> wrote:
> >>>>
> >>>>> We are occasionally seeing a commit which includes the modified
> >>>>> files and
> >>>>> one or more unmodified file(s). How is this possible?
> >>>>>
> >>>>> $ svnlook changed -r 496 /export/svn/merlin
> >>>>> U top/branches/v12/code/type.c
> >>>>> U top/branches/v12/tools/crashfmt
> >>>>>
> >>>>> $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
> >>>>> Modified: top/branches/v12/code/type.c
> >>>>>
> >>>>> As you can see, the commit seems to contain textual changes to
> >>>>> two files
> >>>>> ('U' is in column 1). However, when I diff the files, only one
> >>>>> of them has
> >>>>> truly changed. I have tried to see the diff to crashfmt in
> >>>>> other ways as
> >>>>> well, using command line client, viewVc, etc. All agree that
> >>>>> (a) it was
> >>>>> part of the commit and (b) it was not changed.
> >>>>>
> >>
> >> I'd extract the two individual versions of the file and compare them
> >> manually:
> >>
> >> svn checkout -r 495 wc1
> >> svn checkout -r 496 wc2
> >> cmp wc1/.svn/text-base/crashfmt.svn-base wc2/.svn/text-base/
> >> crashfmt.svn-base
> >
> > Done. They are identical.
> >
>
> Are the svn: properties on both revisions identical? If you run 'svn
> diff' instead of cmp, you may be able to see differences in a property
> value.
My previous post showed the output of the properties. But just in case one side had some invisible character, I did
$ svn pl -v crashfmt > pl495
and again for the 496 version. The two files are identical.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2391089
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: unmodified files are being committed
Posted by javajohn <ja...@cox.net>.
On Sep 3, 2009, at 8:49 AM, David Carson wrote:
>> David Carson wrote on Wed, 2 Sep 2009 at 21:24 -0700:
>>>> On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dc...@yahoo.com>
>>>> wrote:
>>>>
>>>>> We are occasionally seeing a commit which includes the modified
>>>>> files and
>>>>> one or more unmodified file(s). How is this possible?
>>>>>
>>>>> $ svnlook changed -r 496 /export/svn/merlin
>>>>> U top/branches/v12/code/type.c
>>>>> U top/branches/v12/tools/crashfmt
>>>>>
>>>>> $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
>>>>> Modified: top/branches/v12/code/type.c
>>>>>
>>>>> As you can see, the commit seems to contain textual changes to
>>>>> two files
>>>>> ('U' is in column 1). However, when I diff the files, only one
>>>>> of them has
>>>>> truly changed. I have tried to see the diff to crashfmt in
>>>>> other ways as
>>>>> well, using command line client, viewVc, etc. All agree that
>>>>> (a) it was
>>>>> part of the commit and (b) it was not changed.
>>>>>
>>
>> I'd extract the two individual versions of the file and compare them
>> manually:
>>
>> svn checkout -r 495 wc1
>> svn checkout -r 496 wc2
>> cmp wc1/.svn/text-base/crashfmt.svn-base wc2/.svn/text-base/
>> crashfmt.svn-base
>
> Done. They are identical.
>
Are the svn: properties on both revisions identical? If you run 'svn
diff' instead of cmp, you may be able to see differences in a property
value.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2391023
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Re: unmodified files are being committed
Posted by David Carson <dc...@yahoo.com>.
> David Carson wrote on Wed, 2 Sep 2009 at 21:24 -0700:
> > > On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dc...@yahoo.com> wrote:
> > >
> > > > We are occasionally seeing a commit which includes the modified files and
> > > > one or more unmodified file(s). How is this possible?
> > > >
> > > > $ svnlook changed -r 496 /export/svn/merlin
> > > > U top/branches/v12/code/type.c
> > > > U top/branches/v12/tools/crashfmt
> > > >
> > > > $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
> > > > Modified: top/branches/v12/code/type.c
> > > >
> > > > As you can see, the commit seems to contain textual changes to two files
> > > > ('U' is in column 1). However, when I diff the files, only one of them has
> > > > truly changed. I have tried to see the diff to crashfmt in other ways as
> > > > well, using command line client, viewVc, etc. All agree that (a) it was
> > > > part of the commit and (b) it was not changed.
> > > >
>
> I'd extract the two individual versions of the file and compare them
> manually:
>
> svn checkout -r 495 wc1
> svn checkout -r 496 wc2
> cmp wc1/.svn/text-base/crashfmt.svn-base wc2/.svn/text-base/crashfmt.svn-base
Done. They are identical.
>
> Does 'crashfmt' have any svn:* properties set?
Yes. The output of the following command is identical for rev 495 and 496 version of the file:
$ svn pl -v crashfmt
Properties on 'crashfmt':
svn:executable
*
>
> > > What is the exact output of the 'svnlook diff' command on the crashfmt path?
> > > Is there any difference if you run 'svn diff' instead?
> > >
> >
> > Some client CLI output:
> >
> > $ svn log -v -r 496 crashfmt
> > ------------------------------------------------------------------------
> > r496 | cburch | 2009-09-02 20:26:17 -0400 (Wed, 02 Sep 2009) | 5 lines
> > Changed paths:
> > M /top/branches/v12/code/type.c
> > M /top/branches/v12/tools/crashfmt
> >
> ...
> > ------------------------------------------------------------------------
> > $ svn log -v crashfmt | grep "^r"
> > r481 | scotch | 2009-07-21 21:00:46 -0400 (Tue, 21 Jul 2009) | 6 lines
> > r479 | scotch | 2009-07-15 20:21:05 -0400 (Wed, 15 Jul 2009) | 5 lines
> > r452 | scotch | 2009-02-28 21:29:00 -0500 (Sat, 28 Feb 2009) | 5 lines
> >
> > Notes:
> > - Second log command, without a specific revision range, shows three earlier revisions on crashfmt, but NOT 496.
> >
>
> Did you 'svn up' before the second log command?
>
Good point. I did an update and the second log command now includes 496.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390711
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Re: unmodified files are being committed
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
David Carson wrote on Wed, 2 Sep 2009 at 21:24 -0700:
> > On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dc...@yahoo.com> wrote:
> >
> > > We are occasionally seeing a commit which includes the modified files and
> > > one or more unmodified file(s). How is this possible?
> > >
> > > $ svnlook changed -r 496 /export/svn/merlin
> > > U top/branches/v12/code/type.c
> > > U top/branches/v12/tools/crashfmt
> > >
> > > $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
> > > Modified: top/branches/v12/code/type.c
> > >
> > > As you can see, the commit seems to contain textual changes to two files
> > > ('U' is in column 1). However, when I diff the files, only one of them has
> > > truly changed. I have tried to see the diff to crashfmt in other ways as
> > > well, using command line client, viewVc, etc. All agree that (a) it was
> > > part of the commit and (b) it was not changed.
> > >
I'd extract the two individual versions of the file and compare them
manually:
svn checkout -r 495 wc1
svn checkout -r 496 wc2
cmp wc1/.svn/text-base/crashfmt.svn-base wc2/.svn/text-base/crashfmt.svn-base
Does 'crashfmt' have any svn:* properties set?
> > What is the exact output of the 'svnlook diff' command on the crashfmt path?
> > Is there any difference if you run 'svn diff' instead?
> >
>
> Some client CLI output:
>
> $ svn log -v -r 496 crashfmt
> ------------------------------------------------------------------------
> r496 | cburch | 2009-09-02 20:26:17 -0400 (Wed, 02 Sep 2009) | 5 lines
> Changed paths:
> M /top/branches/v12/code/type.c
> M /top/branches/v12/tools/crashfmt
>
...
> ------------------------------------------------------------------------
> $ svn log -v crashfmt | grep "^r"
> r481 | scotch | 2009-07-21 21:00:46 -0400 (Tue, 21 Jul 2009) | 6 lines
> r479 | scotch | 2009-07-15 20:21:05 -0400 (Wed, 15 Jul 2009) | 5 lines
> r452 | scotch | 2009-02-28 21:29:00 -0500 (Sat, 28 Feb 2009) | 5 lines
>
> Notes:
> - Second log command, without a specific revision range, shows three earlier revisions on crashfmt, but NOT 496.
>
Did you 'svn up' before the second log command?
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390519
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390527
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Re: unmodified files are being committed
Posted by David Carson <dc...@yahoo.com>.
> On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dc...@yahoo.com> wrote:
>
> > We are occasionally seeing a commit which includes the modified files and
> > one or more unmodified file(s). How is this possible?
> >
> > $ svnlook changed -r 496 /export/svn/merlin
> > U top/branches/v12/code/type.c
> > U top/branches/v12/tools/crashfmt
> >
> > $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
> > Modified: top/branches/v12/code/type.c
> >
> > As you can see, the commit seems to contain textual changes to two files
> > ('U' is in column 1). However, when I diff the files, only one of them has
> > truly changed. I have tried to see the diff to crashfmt in other ways as
> > well, using command line client, viewVc, etc. All agree that (a) it was
> > part of the commit and (b) it was not changed.
> >
> > What is going on?
> >
> > Thanks,
> > David
> >
> > ------------------------------------------------------
> >
> > http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390510
> >
> > To unsubscribe from this discussion, e-mail: [
> > users-unsubscribe@subversion.tigris.org].
> >
>
> What is the exact output of the 'svnlook diff' command on the crashfmt path?
> Is there any difference if you run 'svn diff' instead?
>
Some client CLI output:
$ cd working_copy/path/to/crashfmt
$ svn log -v -r 496 crashfmt
------------------------------------------------------------------------
r496 | cburch | 2009-09-02 20:26:17 -0400 (Wed, 02 Sep 2009) | 5 lines
Changed paths:
M /top/branches/v12/code/type.c
M /top/branches/v12/tools/crashfmt
blah, blah, blah
------------------------------------------------------------------------
$ svn diff -r 495:HEAD crashfmt
$ svn log -v crashfmt | grep "^r"
r481 | scotch | 2009-07-21 21:00:46 -0400 (Tue, 21 Jul 2009) | 6 lines
r479 | scotch | 2009-07-15 20:21:05 -0400 (Wed, 15 Jul 2009) | 5 lines
r452 | scotch | 2009-02-28 21:29:00 -0500 (Sat, 28 Feb 2009) | 5 lines
Notes:
- First log command shows two modified files.
- Diff command has no output.
- Second log command, without a specific revision range, shows three earlier revisions on crashfmt, but NOT 496.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390519
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: unmodified files are being committed
Posted by Daniel Becroft <dj...@gmail.com>.
On Thu, Sep 3, 2009 at 1:48 PM, David Carson <dc...@yahoo.com> wrote:
> We are occasionally seeing a commit which includes the modified files and
> one or more unmodified file(s). How is this possible?
>
> $ svnlook changed -r 496 /export/svn/merlin
> U top/branches/v12/code/type.c
> U top/branches/v12/tools/crashfmt
>
> $ svnlook diff -r 496 /export/svn/merlin | grep "^Modified"
> Modified: top/branches/v12/code/type.c
>
> As you can see, the commit seems to contain textual changes to two files
> ('U' is in column 1). However, when I diff the files, only one of them has
> truly changed. I have tried to see the diff to crashfmt in other ways as
> well, using command line client, viewVc, etc. All agree that (a) it was
> part of the commit and (b) it was not changed.
>
> What is going on?
>
> Thanks,
> David
>
> ------------------------------------------------------
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390510
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe@subversion.tigris.org].
>
What is the exact output of the 'svnlook diff' command on the crashfmt path?
Is there any difference if you run 'svn diff' instead?
Cheers,
Daniel B.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390514
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].