[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-sdk-devel
Subject:    Re: kapptemplate rules
From:       Sebastian_Dörner <sebastian () sebastian-doerner ! de>
Date:       2013-01-22 14:16:58
Message-ID: CA+_kBjCg2kL74xqDCnhcnLcfBr5Rq+Q7O8HBXwT9R6LPnvN0Og () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Are you sure it's exactly the same result?
There is one commit just at the edge of both parent maps. Iirc, when I
tried it with one parentmap, this commit was duplicated, once connected to
the forward-history, once connected to the backwards-history.

If this does not occur anymore, then there is no reason to have that split.
I guess there might also be better ways to make sure that commit is proper
part of the history, but I don't remember the details anymore. I'll try to
be online this GMT--evening. Have to finish up okteta as well.


On 22 January 2013 03:03, Jeremy Whiting <jpwhiting@kde.org> wrote:

> Sebastian,
> I'm trying to fix up the kapptemplate-rules so the deletion of some files
> from the sources before the rewrite is merged in doesn't bring the files
> back.  I.e. there are some files like summary.ui that shouldn't exist in
> master but do because of the parentmap files.  Anyway, I don't understand
> why there are two parentmap files.  If I run them both sequentially and
> compare the result to running one parentmap with the contents of both files
> I get the same result.  Could you explain why you split the parentmaps into
> two files?
>
> thanks,
> Jeremy
>

[Attachment #5 (text/html)]

<div dir="ltr">Are you sure it&#39;s exactly the same result?<div>There is one commit \
just at the edge of both parent maps. Iirc, when I tried it with one parentmap, this \
commit was duplicated, once connected to the forward-history, once connected to the \
backwards-history.</div> <div><br></div><div style>If this does not occur anymore, \
then there is no reason to have that split. I guess there might also be better ways \
to make sure that commit is proper part of the history, but I don&#39;t remember the \
details anymore. I&#39;ll try to be online this GMT--evening. Have to finish up \
okteta as well.</div> </div><div class="gmail_extra"><br><br><div \
class="gmail_quote">On 22 January 2013 03:03, Jeremy Whiting <span dir="ltr">&lt;<a \
href="mailto:jpwhiting@kde.org" target="_blank">jpwhiting@kde.org</a>&gt;</span> \
wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex"> <div dir="ltr"><div>Sebastian,<br></div>I&#39;m trying \
to fix up the kapptemplate-rules so the deletion of some files from the sources \
before the rewrite is merged in doesn&#39;t bring the files back.  I.e. there are \
some files like summary.ui that shouldn&#39;t exist in master but do because of the \
parentmap files.  Anyway, I don&#39;t understand why there are two parentmap files.  \
If I run them both sequentially and compare the result to running one parentmap with \
the contents of both files I get the same result.  Could you explain why you split \
the parentmaps into two files?<br>

<br>thanks,<br>Jeremy<br></div>
</blockquote></div><br></div>



_______________________________________________
kde-sdk-devel mailing list
kde-sdk-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-sdk-devel


[prev in list] [next in list] [prev in thread] [next in thread]