Re: aerb "file has been altered" errors after removing files in branch
Calvin Webster <[email protected]> Fri, 22 Apr 2016 13:53:15 -0400
| Newsgroups | gmane.comp.version-control.aegis.user |
|---|---|
| Message-ID | <1461347595.14245.72.camel@klink> |
T24gRnJpLCAyMDE2LTA0LTIyIGF0IDEzOjI2IC0wNDAwLCBBcnllaCBGcmllZG1hbiB3cm90ZToK PiBUaGUgYWN0dWFsIHN0cnVjdHVyZSBvZiB0aGUgLEQgZGVwZW5kcyBvbiB5b3VyIGhpc3Rvcnkg dG9vbC4KClRoZSBoaXN0b3J5IHRvb2wgaXMganVzdCBwbGFpbiBvbGUgcmNzICJjaSIgY29tbWFu ZC4KClRoZSBEaWZmIHRvb2wgaXMgcGxhaW4gb2xlICJkaWZmIC11Ii4KCj4gT24gRnJpLCBBcHIg MjIsIDIwMTYgYXQgMToyNCBQTSwgQ2FsdmluIFdlYnN0ZXIgPGN3ZWJzdGVyQGVjLnJyLmNvbT4K PiB3cm90ZToKPiAgICAgICAgIE9uIEZyaSwgMjAxNi0wNC0yMiBhdCAxMjo1OSAtMDQwMCwgQXJ5 ZWggRnJpZWRtYW4gd3JvdGU6Cj4gICAgICAgICA+IEJyYW5jaW5nIGluIGdlbmVyYWwgaXMgYnJv a2VuLiAgRm9yIGV4YW1wbGUgSSBnZXQgdGhlIHNhbWUKPiAgICAgICAgIGlzc3VlIHdoZW4KPiAg ICAgICAgID4gYXR0ZW1wdGluZyB0byBjbG9zZSBhIGJyYW5jaCBldmVuIHdpdGggbm8gZmlsZXMg aGF2ZSBiZWVuCj4gICAgICAgICBhZXJtJ2VkLgo+ICAgICAgICAgPiBZb3VyIGJlc3QgYmV0IGlz IHRvIHVzZSBhZWRpc3QgZnJvbSB0aGUgYnJhbmNoIGNoYW5nZSBzZXQgdG8KPiAgICAgICAgIHRo ZQo+ICAgICAgICAgPiBwYXJlbnQgYmFzZWxpbmUuICAgIEZvciBleGFtcGxlIGlmIHlvdXIgYnJh bmNoIGlzIGZvby4xIGRvCj4gICAgICAgICBhZWRpc3QgLXAKPiAgICAgICAgID4gZm9vIC1jIDEg LXM+Zm9vLmFlICYmIGFlZGlzdCAtcCBmb28gLXI8Zm9vLmFlCj4gICAgICAgICAKPiAgICAgICAg IFRoYXQncyBub3QgcmVhbGx5IGFuIG9wdGlvbiBmb3IgbWUuIFRoaXMgYnJhbmNoIGNhbm5vdCBi ZSBsZWZ0Cj4gICAgICAgICBoYW5naW5nCj4gICAgICAgICBvcGVuLiBUaGlzIGlzIGFuIG9mZi1s aW5lIChpc29sYXRlZCkgVVMgR292dCByZXBvc2l0b3J5IHRoYXQKPiAgICAgICAgIEkndmUgYmVl bgo+ICAgICAgICAgbWFpbnRhaW5pbmcgc2luY2UgdGhlIGxhdGUgOTAncy4gVGhlcmUgaGFzIHRv IGJlIGEgbGVzcyBicnV0YWwKPiAgICAgICAgIHdheSB0bwo+ICAgICAgICAgZ2V0IHRoaXMgYnJh bmNoIGludGVncmF0ZWQuCj4gICAgICAgICAKPiAgICAgICAgIERvZXMgYW55b25lIG9uIHRoZSBs aXN0IGhhdmUgb3RoZXIgaWRlYXM/IEFueW9uZSBmYW1pbGlhciB3aXRoCj4gICAgICAgICBBZWdp cwo+ICAgICAgICAgcmVwb3NpdG9yeSBzdHJ1Y3R1cmUgZ290IGEgd2F5IHRvIG1hbmlwdWxhdGUg dGhlIGhpc3RvcnkgZmlsZXMKPiAgICAgICAgIG9yCj4gICAgICAgICBzb3VyY2UvZGlmZiB0aW1l IHN0YW1wcyB0byBwcmV2ZW50IHRoaXMgZXJyb3IgZnJvbSBibG9ja2luZwo+ICAgICAgICAgdGhl Cj4gICAgICAgICBpbnRlZ3JhdGlvbj8KPiAgICAgICAgIAo+ICAgICAgICAgVGhlIGVycm9yIGlu ZGljYXRlcyBhIGZpbGUgaGFzIGJlZW4gYWx0ZXJlZC4gSSdtIGFzc3VtaW5nCj4gICAgICAgICBB ZWdpcyBpcwo+ICAgICAgICAgY29tcGFyaW5nIHRpbWUgc3RhbXBzIG9uIHNvbWUgZmlsZXMuIFdo ZXRoZXIgdGhlc2UgYXJlCj4gICAgICAgICByZWNvcmRlZCB0aW1lCj4gICAgICAgICBzdGFtcHMg aW4gbWV0YWRhdGEgb3IgcmVhZCBkaXJlY3RseSBmcm9tIHJlcG8gZmlsZXMsIEknbSBub3QKPiAg ICAgICAgIGNlcnRhaW4uCj4gICAgICAgICBJc24ndCB0aGVyZSBhIHdheSB0byByZXNldCBvbmUg b3IgbW9yZSB0aGVzZSBkYXRlL3RpbWUgc3RhbXBzCj4gICAgICAgICB0aGF0IGFyZQo+ICAgICAg ICAgYmVpbmcgcmVmZXJlbmNlZCBzbyBBZWdpcyBpcyBoYXBweT8gSSd2ZSB0cmllZCB2YXJpb3Vz IGNoYW5nZXMKPiAgICAgICAgIHVzaW5nCj4gICAgICAgICAidG91Y2giIGFuZCBlZGl0aW5nIGRp ZmYgKCxEKSBkYXRlL3RpbWUgbGluZXMgd2l0aCBubyBsdWNrIHNvCj4gICAgICAgICBmYXIuCj4g ICAgICAgICAKPiAgICAgICAgIAo+ICAgICAgICAgCj4gICAgICAgICA+IE9uIEZyaSwgQXByIDIy LCAyMDE2IGF0IDEyOjI4IFBNLCBDYWx2aW4gV2Vic3Rlcgo+ICAgICAgICAgPGN3ZWJzdGVyQGVj LnJyLmNvbT4KPiAgICAgICAgID4gd3JvdGU6Cj4gICAgICAgICA+ICAgICAgICAgSSBkb24ndCBz ZWUgYW55IHBvc3RzIHNpbmNlIDA2LzA0LzIwMTUgLSBob3BlIHRoZXJlCj4gICAgICAgICBhcmUg c3RpbGwKPiAgICAgICAgID4gICAgICAgICBhIGZldwo+ICAgICAgICAgPiAgICAgICAgIEFlZ2lz IHZldGVyYW5zIHdhdGNoaW5nIHRoZSBsaXN0Lgo+ICAgICAgICAgPgo+ICAgICAgICAgPiAgICAg ICAgIEkndmUgZW5jb3VudGVyZWQgYSBwYXJ0aWN1bGFybHkgdmV4aW5nIHByb2JsZW0gdGhhdAo+ ICAgICAgICAgSSBjYW4ndAo+ICAgICAgICAgPiAgICAgICAgIHNlZW0gdG8KPiAgICAgICAgID4g ICAgICAgICBvdmVyY29tZS4gQWZ0ZXIgcmVtb3ZpbmcgKGFlcm0pIGEgbnVtYmVyIG9mIGZpbGVz IGluCj4gICAgICAgICBhIGNoYW5nZQo+ICAgICAgICAgPiAgICAgICAgIEkgd2FzIGFibGUKPiAg ICAgICAgID4gICAgICAgICB0byBkZXZlbG9wLCByZXZpZXcsIGFuZCBpbnRlZ3JhdGUgc2V2ZXJh bCBvdGhlcgo+ICAgICAgICAgY2hhbmdlcy4gV2hlbgo+ICAgICAgICAgPiAgICAgICAgIGl0IGNh bWUKPiAgICAgICAgID4gICAgICAgICB0aW1lIHRvIGludGVncmF0ZSB0aGUgYnJhbmNoIEkgZ290 IHRoZSBmb2xsb3dpbmcKPiAgICAgICAgIGVycm9yIG9uIGp1c3QKPiAgICAgICAgID4gICAgICAg ICBvbmUgb2YKPiAgICAgICAgID4gICAgICAgICB0aGUgZmlsZXM6Cj4gICAgICAgICA+Cj4gICAg ICAgICA+ICAgICAgICAgW210cmV2QHBlZ2FzdXMyIH5dJCBhZXJiIC1wIGF2OGI5My4yMyAtYyAx NTAyMwo+ICAgICAgICAgPiAgICAgICAgIGFlZ2lzOiBwcm9qZWN0ICJhdjhiOTMuMjMiOiBjaGFu Z2UgMTUwMjM6IGZpbGUKPiAgICAgICAgID4gICAgICAgICAiQ3ltU09VTkQ5My9iaW4vYnVpbGRp bmZvLEQiCj4gICAgICAgICA+ICAgICAgICAgICAgICAgICBoYXMgYmVlbiBhbHRlcmVkCj4gICAg ICAgICA+ICAgICAgICAgW210cmV2QHBlZ2FzdXMyIH5dJAo+ICAgICAgICAgPgo+ICAgICAgICAg PiAgICAgICAgIEkgZG9uJ3QgcmVhbGx5IGNhcmUgYWJvdXQgdGhlIGhpc3Rvcnkgb24gdGhpcyBm aWxlCj4gICAgICAgICBvciB0aGUKPiAgICAgICAgID4gICAgICAgICBvdGhlcnMgdGhhdAo+ICAg ICAgICAgPiAgICAgICAgIHdlcmUgcmVtb3ZlZC4gVGhlc2Ugd2VyZSBkZXJpdmVkIGZpbGVzIHRo YXQgc2hvdWxkCj4gICAgICAgICBub3QgaGF2ZQo+ICAgICAgICAgPiAgICAgICAgIGJlZW4gY29w aWVkCj4gICAgICAgICA+ICAgICAgICAgaW4gYXMgc291cmNlIHRvIGJlZ2luIHdpdGguIEkganVz dCBuZWVkIHRvIGludGVncmF0ZQo+ICAgICAgICAgdGhpcwo+ICAgICAgICAgPiAgICAgICAgIGJy YW5jaC4gQW55Cj4gICAgICAgICA+ICAgICAgICAgaGVscCBhbG9uZyB0aGVzZSBsaW5lcyB3b3Vs ZCBiZSBncmVhdGx5IGFwcHJlY2lhdGVkLgo+ICAgICAgICAgPgo+ICAgICAgICAgPiAgICAgICAg IFN0cmFuZ2VseSwgYWxsIHRoZSBmaWxlcyBJICJhZXJtJ2QiIGV4aXN0IGluIHRoZQo+ICAgICAg ICAgYnJhbmNoCj4gICAgICAgICA+ICAgICAgICAgYmFzZWxpbmUgd2l0aG91dAo+ICAgICAgICAg PiAgICAgICAgIGFueSBkaWZmIGZpbGVzICgsRCkuIEl0IGhhcyBiZWVuIG15IGV4cGVyaWVuY2Ug dGhhdAo+ICAgICAgICAgd2hlbiBmaWxlcwo+ICAgICAgICAgPiAgICAgICAgIGFyZQo+ICAgICAg ICAgPiAgICAgICAgIHJlbW92ZWQgd2l0aCBhZXJtLCB0aGUgb3JpZ2luYWwgZmlsZSBpcyByZW1v dmVkIGZyb20KPiAgICAgICAgIHRoZQo+ICAgICAgICAgPiAgICAgICAgIGJyYW5jaCBiYXNlbGlu ZQo+ICAgICAgICAgPiAgICAgICAgIGFuZCBhICxEIGZpbGUgaXMgcGxhY2VkIHRoZXJlLiBUaGUg LEQgZmlsZSBpcyBhIGRpZmYKPiAgICAgICAgID4gICAgICAgICBhZ2FpbnN0IC9kZXYvbnVsbAo+ ICAgICAgICAgPiAgICAgICAgIHdpdGggYSAiLSIgc2lnbiBpbiBmcm9udCBvZiBldmVyeSBsaW5l LiBOb25lIG9mCj4gICAgICAgICB0aGVzZSBleGlzdAo+ICAgICAgICAgPiAgICAgICAgIGZvciB0 aGUKPiAgICAgICAgID4gICAgICAgICBmaWxlcyBJIHJlbW92ZWQsIHlldCB0aGUgY2hhbmdlcyBp biB0aGlzIGJyYW5jaAo+ICAgICAgICAgbmV2ZXIKPiAgICAgICAgID4gICAgICAgICBjb21wbGFp bmVkLiBFYWNoCj4gICAgICAgICA+Cj4gICAgICAgICA+ICAgICAgICAgRGV2ZWxvcG1lbnQgZGly ZWN0b3J5IHN0eWxlIGRvZXMgaW5jbHVkZSBjb3BpZXMgb2YKPiAgICAgICAgIGRlcml2ZWQKPiAg ICAgICAgID4gICAgICAgICBmaWxlcy4gVGhpcwo+ICAgICAgICAgPiAgICAgICAgIG1heSBiZSB3 aHkgdGhlIG9yaWdpbmFsIGZpbGVzIGFyZSBzdGlsbCB0aGVyZSBidXQKPiAgICAgICAgIGRvZXNu J3QKPiAgICAgICAgID4gICAgICAgICBleHBsYWluIHdoeQo+ICAgICAgICAgPiAgICAgICAgIHRo ZSAsRCBmaWxlcyBhcmUgbWlzc2luZy4uLiBhbmQgd2h5IG9ubHkgdGhlIG9uZQo+ICAgICAgICAg ZmlsZSBvdXQgb2YKPiAgICAgICAgID4gICAgICAgICBkb3plbnMgb2YKPiAgICAgICAgID4gICAg ICAgICBvdGhlcnM/Cj4gICAgICAgICA+Cj4gICAgICAgICA+Cj4gICAgICAgICA+ICAgICAgICAg T3RoZXIgcmVsZXZhbnQgaW5mbzoKPiAgICAgICAgID4KPiAgICAgICAgID4gICAgICAgICBhZWdp cy5jb25mOgo+ICAgICAgICAgPiAgICAgICAgIGRldmVsb3BtZW50X2RpcmVjdG9yeV9zdHlsZSA9 Cj4gICAgICAgICA+ICAgICAgICAgewo+ICAgICAgICAgPiAgICAgICAgICAgICBzb3VyY2VfZmls ZV9zeW1saW5rID0gdHJ1ZTsKPiAgICAgICAgID4gICAgICAgICAgICAgZGVyaXZlZF9maWxlX2Nv cHkgPSB0cnVlOwo+ICAgICAgICAgPiAgICAgICAgICAgICBkZXJpdmVkX2ZpbGVfYXRfc3RhcnRf b25seSA9IHRydWU7Cj4gICAgICAgICA+ICAgICAgICAgfQo+ICAgICAgICAgPgo+ICAgICAgICAg Pgo+ICAgICAgICAgPiAgICAgICAgIFRoYW5rcyBpbiBhZHZhbmNlIGZvciBhbnkgaGVscC4KPiAg ICAgICAgID4KPiAgICAgICAgID4gICAgICAgICAuL0NhbCBXZWJzdGVyCj4gICAgICAgICA+Cj4g ICAgICAgICA+ICAgICAgICAgX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KPiAgICAgICAgID4gICAgICAgICBBZWdpcy11c2VycyBtYWlsaW5nIGxpc3QKPiAg ICAgICAgID4gICAgICAgICBBZWdpcy11c2Vyc0BsaXN0cy5hdXVnLm9yZy5hdQo+ICAgICAgICAg PiAgICAgICAgIGh0dHBzOi8vbGlzdHMuYXV1Zy5vcmcuYXUvbGlzdGluZm8vYWVnaXMtdXNlcnMK PiAgICAgICAgID4KPiAgICAgICAgID4KPiAgICAgICAgID4KPiAgICAgICAgID4gLS0KPiAgICAg ICAgID4gQXJ5ZWggTS4gRnJpZWRtYW4sIExlYWQgRGV2ZWxvcGVyLAo+ICAgICAgICAgaHR0cDov L3d3dy5QZXRpdGVDbG91ZC5vcmcKPiAgICAgICAgID4KPiAgICAgICAgID4gX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiAgICAgICAgID4gQWVnaXMtdXNl cnMgbWFpbGluZyBsaXN0Cj4gICAgICAgICA+IEFlZ2lzLXVzZXJzQGxpc3RzLmF1dWcub3JnLmF1 Cj4gICAgICAgICA+IGh0dHBzOi8vbGlzdHMuYXV1Zy5vcmcuYXUvbGlzdGluZm8vYWVnaXMtdXNl cnMKPiAgICAgICAgIAo+ICAgICAgICAgCj4gICAgICAgICAKPiAKPiAKPiAKPiAtLSAKPiBBcnll aCBNLiBGcmllZG1hbiwgTGVhZCBEZXZlbG9wZXIsIGh0dHA6Ly93d3cuUGV0aXRlQ2xvdWQub3Jn Cj4gCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWVn aXMtdXNlcnMgbWFpbGluZyBsaXN0CkFlZ2lzLXVzZXJzQGxpc3RzLmF1dWcub3JnLmF1Cmh0dHBz Oi8vbGlzdHMuYXV1Zy5vcmcuYXUvbGlzdGluZm8vYWVnaXMtdXNlcnMK