You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2008/10/05 11:38:27 UTC
Re: svn merge revert commit adds files to the repo that aremissing
in the wc
Ping? There's a second patch[1] (later in the thread; sorry, don't have
the mail here) awaiting response.
Jojakim: please send patches as MIME attachments, or inline (but watch for
whitespace-eating mailers, in the latter case). You can see below (or at [1])
how they look to most of us. Many would not bother decoding the "attachment"
manually.
Thanks,
Daniel
[1] http://thread.gmane.org/gmane.comp.version-control.subversion.devel/104483/focus=104834
Jojakim Stahl wrote on Fri, 19 Sep 2008 at 11:52 +0200:
> Hello Julian,
> I'm no expert in writing Subversion tests and didn't it ever, but sometime
> is first time, so attached you will find a patch for merge_tests.py.
> Hope this helps,
> Jojakim
>
> "Julian Foad" <ju...@btopenworld.com> schrieb im Newsbeitrag
> news:1221777871.29026.35.camel@edith.foad.me.uk...
> > On Thu, 2008-09-18 at 12:53 +0000, Jojakim Stahl wrote:
> >> Hello all,
> >>
> >> I multiple times now had the problem, that I had files in the repo that
> >> were
> >> not in the wc any more. I now found the reason:
> >
> > Hi Jojakim.
> >
> > Thank you for this bug report. If you can spare a bit more time, please
> > could you see if there is already a test for this problem in our test
> > suite. Issue #1962 has a shell script attached, and it mentions recently
> > something about "all but 1 tests passing", but that change was reverted
> > and I don't know if there are actually any tests. If not, could you
> > convert your recipe into a test? That would really help.
> >
> >>From reading some of issue #1962, it looks like this is quite a
> > difficult problem. It would be really good to get it fixed.
> > Unfortunately there don't seem to be any volunteers working on it at the
> > moment. Do you know anybody who could help?
> >
> > Thanks.
> >
> > - Julian
> >
> >
> >> 1.
> >> Merge a changeset X from p1 to p2, where X was
> >> A dir1
> >> A dir1/file1.txt
> >> A dir1/file2.txt
> >>
> >> svn merge -c X p1 p2
> >>
> >> 2.
> >> Merges marks file1.txt as added, but for some reason in p2 I do not need
> >> file1.txt any more (due to some restructuring or something else).
> >> Therefore
> >> revert file1.txt
> >>
> >> svn revert p2/dir1/file1.txt
> >>
> >> 3.
> >> Commit p2
> >>
> >> svn ci p2 -m "Merged dir1 from p1"
> >>
> >> 4.
> >> svn status reports file1.txt as unversioned now. Therefore delete
> >> file1.txt
> >>
> >> del p2/dir1/file1.txt
> >>
> >> 5.
> >> svn status reports nothing now, also svn status --show-updates doesn't
> >> show
> >> anything. Aswell, svn up reports that the wc is up to date. However, svn
> >> ls
> >> p2/dir1 reports file1.txt to be in the repo.
> >>
> >> I struggled may times over this problem now. Especially because you do
> >> not see
> >> that the repo has someting that is not in the wc. And if you take p2 as
> >> base
> >> for other merges now, you get the file1.txt duplicated to pX.
> >>
> >> I search the bug database and found #1962 to be probably the reason of
> >> the
> >> problem. But #1962 is scheduled consider-1.6. I'm wondering whether such
> >> a
> >> fundamental bug in merging shouldn't be fixed as soon as possible (next
> >> 1.5
> >> fix?). Aren't others dealing with such problems, too?
> >>
> >> The problem in reality is: Your wc is compiling well and you commit.
> >> Others
> >> update there wc and your commit breaks their wc compiling. This happens
> >> one
> >> time, two time, and then your boss will ask you some questions...
> >>
> >> Thanks,
> >>
> >> Jojakim Stahl
> >>
> >>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> >> For additional commands, e-mail: dev-help@subversion.tigris.org
> >>
>
>
> begin 666 merge_tests.py.patch
> M26YD97@Z(&UE<F=E7W1E<W1S+G!Y#0H]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
> M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
> M#0HM+2T@;65R9V5?=&5S=',N<'D)*%)E=FES:6]N(#,S,3<W*0T**RLK(&UE
> M<F=E7W1E<W1S+G!Y"2A!<F)E:71S:V]P:64I#0I 0" M,3,Y,S0L,3 @*S$S
> M.3,T+#0X($! #0H@(" @(" @(" @(" @(" @97AP96-T961?<W1A='5S+ T*
> M(" @(" @(" @(" @(" @(&5X<&5C=&5D7W-K:7 L#0H@(" @(" @(" @(" @
> M("D@72P@1F%L<V4I#0HK(RTM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM
> M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2T-"B -
> M"BLC($-O;6UI=&EN9R!A(&UE<F=E('=I=&@@<F5V97)T960@861D960@9FEL
> M92!S:&]U;&0@;F]T(&%D9"!T:&4@9FEL92 -"BLC('1O('1H92!R97!O#0H@
> M#0HK9&5F(&1O;G1?861D7W)E=F5R=&5D7V9I;&4H<V)O>"DZ#0HK(" B9&]N
> M)W0@861D(&$@<F5V97)T960@02L@<W1A=&4@9FEL92!T;R!R97!O(@T*( T*
> M*R @<V)O>"YB=6EL9"@I#0HK("!W8U]D:7(@/2!S8F]X+G=C7V1I<@T**R @
> M<W9N7V-O;6UI="YR97!O7W)E=B ](#$-"B -"BL@(%$Q7W!A=&@@/2!O<RYP
> M871H+FIO:6XH=V-?9&ER+" G43$G*0T**R @43)?<&%T:" ](&]S+G!A=&@N
> M:F]I;BAW8U]D:7(L("=1,B<I#0HK("!27W!A=&@@/2!O<RYP871H+FIO:6XH
> M43%?<&%T:"P@)U(G*0T**R @9FEL93%?43%?<&%T:" ](&]S+G!A=&@N:F]I
> M;BA1,5]P871H+" G4B<L("=F:6QE,2<I#0HK("!F:6QE,E]1,5]P871H(#T@
> M;W,N<&%T:"YJ;VEN*%$Q7W!A=&@L("=2)RP@)V9I;&4R)RD-"BL@(&9I;&4Q
> M7U$R7W!A=&@@/2!O<RYP871H+FIO:6XH43)?<&%T:"P@)U(G+" G9FEL93$G
> M*0T**R @#0HK("!S=FYT97-T+FUA:6XN<G5N7W-V;BA.;VYE+" G;6MD:7(G
> M+"!1,5]P871H*0T**R @<W9N=&5S="YM86EN+G)U;E]S=FXH3F]N92P@)VUK
> M9&ER)RP@43)?<&%T:"D-"BL@('-V;E]C;VUM:70H=V-?9&ER*0T**R @<W9N
> M=&5S="YM86EN+G)U;E]S=FXH3F]N92P@)W5P9&%T92<L('=C7V1I<BD-"BL@
> M( T**R @;W,N;6MD:7(H4E]P871H*0T**R @9FEL;%]F:6QE7W=I=&A?;&EN
> M97,H9FEL93%?43%?<&%T:"P@,2D-"BL@(&9I;&Q?9FEL95]W:71H7VQI;F5S
> M*&9I;&4R7U$Q7W!A=&@L(#$I#0HK("!S=FYT97-T+FUA:6XN<G5N7W-V;BA.
> M;VYE+" G861D)RP@4E]P871H*0T**R @<U]R979?861D(#T@<W9N7V-O;6UI
> M="AW8U]D:7(I#0HK#0HK("!S=FY?;65R9V4H<U]R979?861D+"!1,5]P871H
> M+"!1,E]P871H*0T**R @<W9N=&5S="YM86EN+G)U;E]S=FXH3F]N92P@)W)E
> M=F5R="<L(&9I;&4Q7U$R7W!A=&@I#0HK("!S=FY?8V]M;6ET*'=C7V1I<BD-
> M"BL@(&5X<&5C=&5D7V]U='!U=" ]('-V;G1E<W0N=F5R:69Y+E5N;W)D97)E
> M9$]U='!U="A;(E(O7&XB+" B4B]F:6QE,EQN(ETI#0HK("!S=FYT97-T+F%C
> M=&EO;G,N<G5N7V%N9%]V97)I9GE?<W9N*$YO;F4L(&5X<&5C=&5D7V]U='!U
> M="P@6UTL("=L<R<L("<M4B<L#0HK(" @(" @(" @(" @(" @(" @(" @(" @
> M(" @(" @(" @(" @(%$R7W!A=&@I#0HK(" -"BL-"BL-"BL-"BL-"BL-"B C
> M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C
> M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,-"B C(%)U;B!T:&4@=&5S=',-
> M"B -"D! ("TQ-#$S-RPV("LQ-#$W-2PW($! #0H@(" @(" @(" @(" @("!T
> M<F5E7V-O;F9L:6-T<U]O;E]M97)G95]N;U]L;V-A;%]C:5\U7S$L#0H@(" @
> M(" @(" @(" @("!T<F5E7V-O;F9L:6-T<U]O;E]M97)G95]N;U]L;V-A;%]C
> M:5\U7S(L#0H@(" @(" @(" @(" @("!T<F5E7V-O;F9L:6-T<U]O;E]M97)G
> M95]N;U]L;V-A;%]C:5\V+ T**R @(" @(" @(" @(" @9&]N=%]A9&1?<F5V
> M97)T961?9FEL92P-"B @(" @(" @(" @(" @70T*( T*(&EF(%]?;F%M95]?
> 1(#T]("=?7VUA:6Y?7R<Z#0H`
> `
> end
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge revert commit adds files to the repo that aremissing in the wc
Posted by Jojakim Stahl <jo...@jojakim.de>.
"Daniel Shahaf" <d....@daniel.shahaf.name> schrieb:
> ...
> Jojakim: please send patches as MIME attachments, or inline (but watch for
> whitespace-eating mailers, in the latter case). You can see below (or at
> [1])
> how they look to most of us. Many would not bother decoding the
> "attachment"
> manually.
> ...
Hello Daniel,
I'm using the mailing list via the gmane news-Reader interface; and outlook
express as the news-reader. I used "Answer newsgroup" and attached a .diff
file. Don't know whether M$s attachment handling is wrong, or it's gmane
that mangles up the attachment.
How are you, or others, using the list? To me, the threaded newsreader
interface is much more attractive than the flat mailing interface. Has
someone else experiences using the gmane news-interface?
Should I use another news-reader? Perhaps I should, 'cause Outlook Express 6
seems to have problems with some posts here. The mails from C. Michael
Pilato do not have any text in the body but two attachments, signature.asc
and ATT00028.txt, the latter containing the message text.
Do I have to post the patch again?
--
Jojakim
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge revert commit adds files to the repo that aremissing
in the wc
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Jojakim Stahl wrote on Mon, 6 Oct 2008 at 16:58 +0200:
> As Daniel asked, I resend the patch.
Thanks for resending. This time the attachment was MIME, however it had
MIME type application/octet-stream instead of text/plain or similar.
(No need to resend again, though.)
Has this problem been fixed in trunk? If not, feel free to attach the
patch to the relevant issue, so it doesn't get lost.
Thanks,
Daniel
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge revert commit adds files to the repo that aremissing in
the wc
Posted by Jojakim Stahl <jo...@jojakim.de>.
As Daniel asked, I resend the patch.
--
Jojakim
Am 05.10.2008, 13:38 Uhr, schrieb Daniel Shahaf <d....@daniel.shahaf.name>:
> Ping? There's a second patch[1] (later in the thread; sorry, don't have
> the mail here) awaiting response.
>
> Jojakim: please send patches as MIME attachments, or inline (but watch
> for
> whitespace-eating mailers, in the latter case). You can see below (or
> at [1])
> how they look to most of us. Many would not bother decoding the
> "attachment"
> manually.
>
> Thanks,
>
> Daniel
>
> [1]
> http://thread.gmane.org/gmane.comp.version-control.subversion.devel/104483/focus=104834
>
> Jojakim Stahl wrote on Fri, 19 Sep 2008 at 11:52 +0200:
>> Hello Julian,
>> I'm no expert in writing Subversion tests and didn't it ever, but
>> sometime
>> is first time, so attached you will find a patch for merge_tests.py.
>> Hope this helps,
>> Jojakim
>>
>> "Julian Foad" <ju...@btopenworld.com> schrieb im Newsbeitrag
>> news:1221777871.29026.35.camel@edith.foad.me.uk...
>> > On Thu, 2008-09-18 at 12:53 +0000, Jojakim Stahl wrote:
>> >> Hello all,
>> >>
>> >> I multiple times now had the problem, that I had files in the repo
>> that
>> >> were
>> >> not in the wc any more. I now found the reason:
>> >
>> > Hi Jojakim.
>> >
>> > Thank you for this bug report. If you can spare a bit more time,
>> please
>> > could you see if there is already a test for this problem in our test
>> > suite. Issue #1962 has a shell script attached, and it mentions
>> recently
>> > something about "all but 1 tests passing", but that change was
>> reverted
>> > and I don't know if there are actually any tests. If not, could you
>> > convert your recipe into a test? That would really help.
>> >
>> >>From reading some of issue #1962, it looks like this is quite a
>> > difficult problem. It would be really good to get it fixed.
>> > Unfortunately there don't seem to be any volunteers working on it at
>> the
>> > moment. Do you know anybody who could help?
>> >
>> > Thanks.
>> >
>> > - Julian
>> >
>> >
>> >> 1.
>> >> Merge a changeset X from p1 to p2, where X was
>> >> A dir1
>> >> A dir1/file1.txt
>> >> A dir1/file2.txt
>> >>
>> >> svn merge -c X p1 p2
>> >>
>> >> 2.
>> >> Merges marks file1.txt as added, but for some reason in p2 I do not
>> need
>> >> file1.txt any more (due to some restructuring or something else).
>> >> Therefore
>> >> revert file1.txt
>> >>
>> >> svn revert p2/dir1/file1.txt
>> >>
>> >> 3.
>> >> Commit p2
>> >>
>> >> svn ci p2 -m "Merged dir1 from p1"
>> >>
>> >> 4.
>> >> svn status reports file1.txt as unversioned now. Therefore delete
>> >> file1.txt
>> >>
>> >> del p2/dir1/file1.txt
>> >>
>> >> 5.
>> >> svn status reports nothing now, also svn status --show-updates
>> doesn't
>> >> show
>> >> anything. Aswell, svn up reports that the wc is up to date. However,
>> svn
>> >> ls
>> >> p2/dir1 reports file1.txt to be in the repo.
>> >>
>> >> I struggled may times over this problem now. Especially because you
>> do
>> >> not see
>> >> that the repo has someting that is not in the wc. And if you take p2
>> as
>> >> base
>> >> for other merges now, you get the file1.txt duplicated to pX.
>> >>
>> >> I search the bug database and found #1962 to be probably the reason
>> of
>> >> the
>> >> problem. But #1962 is scheduled consider-1.6. I'm wondering whether
>> such
>> >> a
>> >> fundamental bug in merging shouldn't be fixed as soon as possible
>> (next
>> >> 1.5
>> >> fix?). Aren't others dealing with such problems, too?
>> >>
>> >> The problem in reality is: Your wc is compiling well and you commit.
>> >> Others
>> >> update there wc and your commit breaks their wc compiling. This
>> happens
>> >> one
>> >> time, two time, and then your boss will ask you some questions...
>> >>
>> >> Thanks,
>> >>
>> >> Jojakim Stahl
>> >>
>> >>
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> >> For additional commands, e-mail: dev-help@subversion.tigris.org
>> >>
>>
>>
>> begin 666 merge_tests.py.patch
>> M26YD97@Z(&UE<F=E7W1E<W1S+G!Y#0H]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
>> M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
>> M#0HM+2T@;65R9V5?=&5S=',N<'D)*%)E=FES:6]N(#,S,3<W*0T**RLK(&UE
>> M<F=E7W1E<W1S+G!Y"2A!<F)E:71S:V]P:64I#0I 0" M,3,Y,S0L,3 @*S$S
>> M.3,T+#0X($! #0H@(" @(" @(" @(" @(" @97AP96-T961?<W1A='5S+ T*
>> M(" @(" @(" @(" @(" @(&5X<&5C=&5D7W-K:7 L#0H@(" @(" @(" @(" @
>> M("D@72P@1F%L<V4I#0HK(RTM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM
>> M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2T-"B -
>> M"BLC($-O;6UI=&EN9R!A(&UE<F=E('=I=&@@<F5V97)T960@861D960@9FEL
>> M92!S:&]U;&0@;F]T(&%D9"!T:&4@9FEL92 -"BLC('1O('1H92!R97!O#0H@
>> M#0HK9&5F(&1O;G1?861D7W)E=F5R=&5D7V9I;&4H<V)O>"DZ#0HK(" B9&]N
>> M)W0@861D(&$@<F5V97)T960@02L@<W1A=&4@9FEL92!T;R!R97!O(@T*( T*
>> M*R @<V)O>"YB=6EL9"@I#0HK("!W8U]D:7(@/2!S8F]X+G=C7V1I<@T**R @
>> M<W9N7V-O;6UI="YR97!O7W)E=B ](#$-"B -"BL@(%$Q7W!A=&@@/2!O<RYP
>> M871H+FIO:6XH=V-?9&ER+" G43$G*0T**R @43)?<&%T:" ](&]S+G!A=&@N
>> M:F]I;BAW8U]D:7(L("=1,B<I#0HK("!27W!A=&@@/2!O<RYP871H+FIO:6XH
>> M43%?<&%T:"P@)U(G*0T**R @9FEL93%?43%?<&%T:" ](&]S+G!A=&@N:F]I
>> M;BA1,5]P871H+" G4B<L("=F:6QE,2<I#0HK("!F:6QE,E]1,5]P871H(#T@
>> M;W,N<&%T:"YJ;VEN*%$Q7W!A=&@L("=2)RP@)V9I;&4R)RD-"BL@(&9I;&4Q
>> M7U$R7W!A=&@@/2!O<RYP871H+FIO:6XH43)?<&%T:"P@)U(G+" G9FEL93$G
>> M*0T**R @#0HK("!S=FYT97-T+FUA:6XN<G5N7W-V;BA.;VYE+" G;6MD:7(G
>> M+"!1,5]P871H*0T**R @<W9N=&5S="YM86EN+G)U;E]S=FXH3F]N92P@)VUK
>> M9&ER)RP@43)?<&%T:"D-"BL@('-V;E]C;VUM:70H=V-?9&ER*0T**R @<W9N
>> M=&5S="YM86EN+G)U;E]S=FXH3F]N92P@)W5P9&%T92<L('=C7V1I<BD-"BL@
>> M( T**R @;W,N;6MD:7(H4E]P871H*0T**R @9FEL;%]F:6QE7W=I=&A?;&EN
>> M97,H9FEL93%?43%?<&%T:"P@,2D-"BL@(&9I;&Q?9FEL95]W:71H7VQI;F5S
>> M*&9I;&4R7U$Q7W!A=&@L(#$I#0HK("!S=FYT97-T+FUA:6XN<G5N7W-V;BA.
>> M;VYE+" G861D)RP@4E]P871H*0T**R @<U]R979?861D(#T@<W9N7V-O;6UI
>> M="AW8U]D:7(I#0HK#0HK("!S=FY?;65R9V4H<U]R979?861D+"!1,5]P871H
>> M+"!1,E]P871H*0T**R @<W9N=&5S="YM86EN+G)U;E]S=FXH3F]N92P@)W)E
>> M=F5R="<L(&9I;&4Q7U$R7W!A=&@I#0HK("!S=FY?8V]M;6ET*'=C7V1I<BD-
>> M"BL@(&5X<&5C=&5D7V]U='!U=" ]('-V;G1E<W0N=F5R:69Y+E5N;W)D97)E
>> M9$]U='!U="A;(E(O7&XB+" B4B]F:6QE,EQN(ETI#0HK("!S=FYT97-T+F%C
>> M=&EO;G,N<G5N7V%N9%]V97)I9GE?<W9N*$YO;F4L(&5X<&5C=&5D7V]U='!U
>> M="P@6UTL("=L<R<L("<M4B<L#0HK(" @(" @(" @(" @(" @(" @(" @(" @
>> M(" @(" @(" @(" @(%$R7W!A=&@I#0HK(" -"BL-"BL-"BL-"BL-"BL-"B C
>> M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C
>> M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,-"B C(%)U;B!T:&4@=&5S=',-
>> M"B -"D! ("TQ-#$S-RPV("LQ-#$W-2PW($! #0H@(" @(" @(" @(" @("!T
>> M<F5E7V-O;F9L:6-T<U]O;E]M97)G95]N;U]L;V-A;%]C:5\U7S$L#0H@(" @
>> M(" @(" @(" @("!T<F5E7V-O;F9L:6-T<U]O;E]M97)G95]N;U]L;V-A;%]C
>> M:5\U7S(L#0H@(" @(" @(" @(" @("!T<F5E7V-O;F9L:6-T<U]O;E]M97)G
>> M95]N;U]L;V-A;%]C:5\V+ T**R @(" @(" @(" @(" @9&]N=%]A9&1?<F5V
>> M97)T961?9FEL92P-"B @(" @(" @(" @(" @70T*( T*(&EF(%]?;F%M95]?
>> 1(#T]("=?7VUA:6Y?7R<Z#0H`
>> `
>> end