From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Aleksey Midenkov Newsgroups: gmane.emacs.bugs Subject: bug#24776: smerge-mode: smerge-swap doesn't swap hunk badges Date: Sun, 23 Oct 2016 21:57:08 +0700 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1477243882 7654 195.159.176.226 (23 Oct 2016 17:31:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 23 Oct 2016 17:31:22 +0000 (UTC) To: 24776@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 23 19:31:18 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1byMbz-0000Gi-LX for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Oct 2016 19:31:07 +0200 Original-Received: from localhost ([::1]:41869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byMc2-0006Le-0X for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Oct 2016 13:31:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byMbw-0006LW-2i for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 13:31:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byMbu-0004Dy-T9 for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 13:31:04 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1byMbu-0004De-OW for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 13:31:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1byMbu-0004Yr-J3 for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 13:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Aleksey Midenkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Oct 2016 17:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 24776 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.147724384616690 (code B ref -1); Sun, 23 Oct 2016 17:31:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Oct 2016 17:30:46 +0000 Original-Received: from localhost ([127.0.0.1]:49449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1byMbe-0004Kt-86 for submit@debbugs.gnu.org; Sun, 23 Oct 2016 13:30:46 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:52579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1byKDU-0008K8-CQ for submit@debbugs.gnu.org; Sun, 23 Oct 2016 10:57:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byKDO-0000lv-3t for submit@debbugs.gnu.org; Sun, 23 Oct 2016 10:57:35 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:50555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1byKDN-0000lp-W6 for submit@debbugs.gnu.org; Sun, 23 Oct 2016 10:57:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byKDM-0003eK-DA for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 10:57:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byKDL-0000lZ-8r for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 10:57:32 -0400 Original-Received: from mail-it0-x22e.google.com ([2607:f8b0:4001:c0b::22e]:36166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1byKDL-0000lH-2R for bug-gnu-emacs@gnu.org; Sun, 23 Oct 2016 10:57:31 -0400 Original-Received: by mail-it0-x22e.google.com with SMTP id e187so101450228itc.1 for ; Sun, 23 Oct 2016 07:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=IsWn69+7iN9ypPPLLkelZVh8hWj9xHMn5mYrHPb74f8=; b=BXxDbUtj5r1PbdaaJQFsTtfb4/+uBZRzGpTqhlIiag6sQG2Or22znZ0WTRJhgv/UZ4 EgBTXl1s6ejbdAZeaWiHO/BRk1cKhza9zmoka9DgNgp3QrTghfWk4l0bZF5StC+/svcX KjZBvQNUMOrMtTv0d60Nur1w1C8iMcoX0jKwvwLBgunmHnUBsFk2T7sFD1EwNlneS/K3 XMVE/PCytSkw5v/6Hkbzxhx03FkkWoz+X57BAU2y3FTYvnKtCiWChDwl70ECYkX8pBhX 4t+b9LmdFOH+cb69s1InaRzG6HYcUpZzFWlLLcWsKsmGOrlVbAvG/xgBR0uyS5+23qYb bIVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=IsWn69+7iN9ypPPLLkelZVh8hWj9xHMn5mYrHPb74f8=; b=JnL5jz7LzhYk6IipDzyEAsy1cXSMGRC2qkAQm2MLeuvw1c+1O2dKYIQhJc3eiMi/t+ VZIUejfxadgD8ROtpLkLpbNhGM/6zJELgpEOy+blHDes2k//g4z5x7D8eUMA+MI+DfIs qoNTch8ytoKr6cWfBMgMFz4mb8KmjDPfnewW9JSMnPQBdtiZVBBlNmvE3p4KKQeJ+1wL 5gasZPffv9Xho/EJ1w5+JYXklBuQvuJfnCTPj/y6vVlP80Rqf6HMiKq3hTwdoE5LJcUN 1SiX4QZQfHc1G59vIsGisZxUau5rVGKv3sXXLIY9EnhKvXijk0hmkVuAR+mLJoBiOm6h TkXQ== X-Gm-Message-State: ABUngvc0xohR4Wf84YK4HcNN9CA/XzjwDfUWKF4xmluWsx1inK49MLd5mAU4Lvv/esT/ZssbCtDGIUSTlqNlvw== X-Received: by 10.107.145.3 with SMTP id t3mr9556391iod.42.1477234648812; Sun, 23 Oct 2016 07:57:28 -0700 (PDT) Original-Received: by 10.107.180.69 with HTTP; Sun, 23 Oct 2016 07:57:08 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Mailman-Approved-At: Sun, 23 Oct 2016 13:30:45 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:124920 Archived-At: ### Original: ```c++ <<<<<<< cbfd48f66c91c6f608359dd73d7c82d4793e95e6 /** Update the record for space_id in SYS_TABLESPACES to this filepath. @param[in] space_id Tablespace ID @param[in] filepath Tablespace filepath @return DB_SUCCESS if OK, dberr_t if the insert failed */ ======= /********************************************************************//** This function parses a SYS_VTQ record, extracts necessary information from the record and returns it to the caller. @return error message, or NULL on success */ UNIV_INTERN const char* dict_process_sys_vtq( /*=======================*/ mem_heap_t* heap, /*!< in/out: heap memory */ const rec_t* rec, /*!< in: current rec */ ullong* col_trx_id, /*!< out: field values */ ullong* col_begin_ts, ullong* col_commit_ts, ullong* col_concurr_trx); /********************************************************************//** Get the filepath for a spaceid from SYS_DATAFILES. This function provides a temporary heap which is used for the table lookup, but not for the path. The caller must free the memory for the path returned. This function can return NULL if the space ID is not found in SYS_DATAFILES, then the caller will assume that the ibd file is in the normal datadir. @return own: A copy of the first datafile found in SYS_DATAFILES.PATH for the given space ID. NULL if space ID is zero or not found. */ UNIV_INTERN char* dict_get_first_path( /*================*/ ulint space, /*!< in: space id */ const char* name); /*!< in: tablespace name */ /********************************************************************//** Update the record for space_id in SYS_TABLESPACES to this filepath. @return DB_SUCCESS if OK, dberr_t if the insert failed */ UNIV_INTERN >>>>>>> IB: 0.2 part I ``` ### After swap: ```c++ <<<<<<< cbfd48f66c91c6f608359dd73d7c82d4793e95e6 /********************************************************************//** This function parses a SYS_VTQ record, extracts necessary information from the record and returns it to the caller. @return error message, or NULL on success */ UNIV_INTERN const char* dict_process_sys_vtq( /*=======================*/ mem_heap_t* heap, /*!< in/out: heap memory */ const rec_t* rec, /*!< in: current rec */ ullong* col_trx_id, /*!< out: field values */ ullong* col_begin_ts, ullong* col_commit_ts, ullong* col_concurr_trx); /********************************************************************//** Get the filepath for a spaceid from SYS_DATAFILES. This function provides a temporary heap which is used for the table lookup, but not for the path. The caller must free the memory for the path returned. This function can return NULL if the space ID is not found in SYS_DATAFILES, then the caller will assume that the ibd file is in the normal datadir. @return own: A copy of the first datafile found in SYS_DATAFILES.PATH for the given space ID. NULL if space ID is zero or not found. */ UNIV_INTERN char* dict_get_first_path( /*================*/ ulint space, /*!< in: space id */ const char* name); /*!< in: tablespace name */ /********************************************************************//** Update the record for space_id in SYS_TABLESPACES to this filepath. @return DB_SUCCESS if OK, dberr_t if the insert failed */ UNIV_INTERN ======= /** Update the record for space_id in SYS_TABLESPACES to this filepath. @param[in] space_id Tablespace ID @param[in] filepath Tablespace filepath @return DB_SUCCESS if OK, dberr_t if the insert failed */ >>>>>>> IB: 0.2 part I ``` ### Expected: ```c++ <<<<<<< IB: 0.2 part I /********************************************************************//** This function parses a SYS_VTQ record, extracts necessary information from the record and returns it to the caller. @return error message, or NULL on success */ UNIV_INTERN const char* dict_process_sys_vtq( /*=======================*/ mem_heap_t* heap, /*!< in/out: heap memory */ const rec_t* rec, /*!< in: current rec */ ullong* col_trx_id, /*!< out: field values */ ullong* col_begin_ts, ullong* col_commit_ts, ullong* col_concurr_trx); /********************************************************************//** Get the filepath for a spaceid from SYS_DATAFILES. This function provides a temporary heap which is used for the table lookup, but not for the path. The caller must free the memory for the path returned. This function can return NULL if the space ID is not found in SYS_DATAFILES, then the caller will assume that the ibd file is in the normal datadir. @return own: A copy of the first datafile found in SYS_DATAFILES.PATH for the given space ID. NULL if space ID is zero or not found. */ UNIV_INTERN char* dict_get_first_path( /*================*/ ulint space, /*!< in: space id */ const char* name); /*!< in: tablespace name */ /********************************************************************//** Update the record for space_id in SYS_TABLESPACES to this filepath. @return DB_SUCCESS if OK, dberr_t if the insert failed */ UNIV_INTERN ======= /** Update the record for space_id in SYS_TABLESPACES to this filepath. @param[in] space_id Tablespace ID @param[in] filepath Tablespace filepath @return DB_SUCCESS if OK, dberr_t if the insert failed */ >>>>>>> cbfd48f66c91c6f608359dd73d7c82d4793e95e6 ```