unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* problem merging from bzr
@ 2012-04-18 10:25 joakim
  2012-04-18 16:39 ` Eli Zaretskii
  0 siblings, 1 reply; 5+ messages in thread
From: joakim @ 2012-04-18 10:25 UTC (permalink / raw)
  To: emacs-devel

I get this weird behaviour all af a sudden:

bzr merge

Merging from remembered submit location bzr+ssh://jave@bzr.savannah.gnu.org/emacs/trunk/
Killedhing revisions:Inserting stream:repacking texts:texts 26866/48438

Notice the "Killed" message in there. This is when I try to merge my
"xwidgets" branch from upstream.

-- 
Joakim Verona



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-04-18 17:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-18 10:25 problem merging from bzr joakim
2012-04-18 16:39 ` Eli Zaretskii
2012-04-18 17:04   ` joakim
2012-04-18 17:12     ` Eli Zaretskii
2012-04-18 17:42       ` Eli Zaretskii

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).