[p4] P4 Verify error, seems like #1 has been changed by submit of #2?

Anders Kjærgaard Hansen ANH at etiglobal.net
Mon Nov 2 00:32:34 PST 2009


Hi Jason

Im not entirely sure I understand your point?

I am not the one doing the submit, my users submit files. And I can't/won't decide how they submit. 

The issue here is, that revision #1, which was submitted in February, upon submit of #2 last week, has change content. 

I would not expect that my users option at submit should be able to allow change of already submitted data. 

Isn't that what you suggest has happened?

/Anders


-----Original Message-----
From: Jason.Fan [mailto:jasonfan at innofidei.com] 
Sent: Monday, November 02, 2009 9:27 AM
To: Anders Kjærgaard Hansen; perforce-user at perforce.com
Subject: RE: [p4] P4 Verify error, seems like #1 has been changed by submit of #2?

Hi Anders,
When you check in files, there is a file attribute selection, such at text,
binary, symlink, etc. I guess you should select your file attribute when you
do submission to avoid such problems.

Thanks,
Jason
-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Anders Kj?rgaard
Hansen
Sent: Monday, November 02, 2009 2:49 PM
To: perforce-user at perforce.com
Subject: Re: [p4] P4 Verify error, seems like #1 has been changed by submit
of #2?

Thought of it as soon as I posted this... Attachments should be included in
text... 

So I have pasted the files from depot and backup at the end of the mail.

/Anders

-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Anders Kjærgaard
Hansen
Sent: Monday, November 02, 2009 7:39 AM
To: 'support at perforce.com'; perforce-user at perforce.com
Subject: [p4] P4 Verify error, seems like #1 has been changed by submit of
#2?

Hi,

During this weekends complete verify of our depot one file came out what a
BAD! Digest.

I have looked a bit at it this morning, and I tend to agree with p4 verify.
I have attached the depot file for this given file in two versions. As it is
in the depot now, and as it was in backup before the last change was
committed.

As I read the files, the asset.xml file had one content in #1 (Add, 258825),
and after having submitted #2 (Edit, 293918) the content in #1 and #2 is
similar and NOT as #1 was originally.

Also when I run p4v and look at revision history I see no difference between
#1 and #2, but as the files attached shows, #1 was different from #2.

My question now is: How could this happen?

And more important - What is the correct way to fix this?

And finally - How do I avoid that this happens again?

Below is the two versions pasted in for convenience. The difference is
around the <components> tag. In #1 it is commented out, and component named
Component1. In #2 it is not commented out, and name has changed to
AutoDialSw.

I hope some of you can help me out here.

Best regards
/Anders

Asset.xml#1 (Add, 258825)
<asset name="AutoDialSw" schema="1.0.0">
<!--
  <autobuild>my_command.cmd</autobuild>
-->

<!--
  <components>
    <component path="">Component1</component>
  </components>
-->

  <perforce>
    <clientlineend>win</clientlineend>
  </perforce>

<!--
  <variants>
    <variant path="">Variant1</variant>
  </variants>
-->

  <scenarios>
    <scenario>external</scenario>
  </scenarios>
</asset>

Asset.xml#1 ( Edit, 293918)
<asset name="AutoDialSw" schema="1.0.0">
<!--
  <autobuild>my_command.cmd</autobuild>
-->

  <components>
    <component path="">AutoDialSw</component>
  </components>

  <perforce>
    <clientlineend>win</clientlineend>
  </perforce>

<!--
  <variants>
    <variant path="">Variant1</variant>
  </variants>
-->

  <scenarios>
    <scenario>external</scenario>
  </scenarios>
</asset>


--------------------------------------
Asset.xml,v  (from backup #1)
--------------------------------------
head     1.258825;
access   ;
symbols  ;
locks    ;comment  @@;


1.258825
date     2009.02.20.10.07.46;  author p4;  state Exp;
branches ;
next     ;


desc
@@


1.258825
log
@@
text
@<asset name="AutoDialSw" schema="1.0.0">
<!--
  <autobuild>my_command.cmd</autobuild>
-->

<!--
  <components>
    <component path="">Component1</component>
  </components>
-->

  <perforce>
    <clientlineend>win</clientlineend>
  </perforce>

<!--
  <variants>
    <variant path="">Variant1</variant>
  </variants>
-->

  <scenarios>
    <scenario>external</scenario>
  </scenarios>
</asset>
@

--------------------------------
Asset.xml,v (from depot #2)
--------------------------------
head     1.293918;
access   ;
symbols  ;
locks    ;comment  @@;


1.293918
date     2009.10.28.13.47.51;  author p4;  state Exp;
branches ;
next     1.258825;

1.258825
date     2009.02.20.10.07.46;  author p4;  state Exp;
branches ;
next     ;


desc
@@


1.293918
log
@@
text
@<asset name="AutoDialSw" schema="1.0.0">
<!--
  <autobuild>my_command.cmd</autobuild>
-->

  <components>
    <component path="">AutoDialSw</component>
  </components>

  <perforce>
    <clientlineend>win</clientlineend>
  </perforce>

<!--
  <variants>
    <variant path="">Variant1</variant>
  </variants>
-->

  <scenarios>
    <scenario>external</scenario>
  </scenarios>
</asset>
@


1.258825
log
@@
text
@@

_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user






More information about the perforce-user mailing list