[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: [Gnu-arch-users] tla star-merge in cycle, how to work around?
From: |
Попков Александр |
Subject: |
RE: [Gnu-arch-users] tla star-merge in cycle, how to work around? |
Date: |
Fri, 25 Mar 2005 18:44:47 +0300 |
On Friday, March 25, 2005 6:19 PM, David Allouche wrote:
>> Only the one problem I see now. For example next situation:
>> 1) Developer merges changes from local to main archive;
>> (and arch generate the new patch-log)
>> 2) All another developers don't change this archive;
>> 3) At night cron run job for automerge, and this patch-log
>> (as a new changeset) will be merged and commited to
>> local archive.
>> 4) Local archive again has changes (last commited patch-log)
>> and developer go to point 1)
>>
>> Is exist right method to handle this situation?
>> Or may be I am use broken ARCH usage schema?
>You should make your automatic merge script smarter so it detects when
>the changes applied by the merge are only patchlog additions, and not
>commit such merges since they would be mere noise.
Advice me please which command I can use for true detect this?
Thanks in advance!
---
WBR, Alexander Popkov.
- [Gnu-arch-users] tla star-merge in cycle, how to work around?, Попков Александр, 2005/03/25
- RE: [Gnu-arch-users] tla star-merge in cycle, how to work around?,
Попков Александр <=
- FW: [Gnu-arch-users] tla star-merge in cycle, how to work around?, Попков Александр, 2005/03/28
- Re: [Gnu-arch-users] tla star-merge in cycle, how to work around?, John Arbash Meinel, 2005/03/28
- RE: [Gnu-arch-users] tla star-merge in cycle, how to work around?, Попков Александр, 2005/03/28
- RE: [Gnu-arch-users] tla star-merge in cycle, how to work around?, Попков Александр, 2005/03/29